From b14e5dcb5942d8e1bce6830edf0768d3b9017fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 30 Nov 2023 11:42:53 +0100 Subject: [PATCH] sync: fix recursive remote sync MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the snapshot pulling code always selected the "top" namespace of the source, instead of the passed in namespace parameter. Signed-off-by: Fabian Grünbichler Reviewed-by: Dominik Csapak Tested-by: Dominik Csapak --- src/server/pull.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index 66ef333a..44d428fd 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -187,7 +187,7 @@ impl PullSource for RemoteSource { async fn list_backup_dirs( &self, - _namespace: &BackupNamespace, + namespace: &BackupNamespace, group: &BackupGroup, worker: &WorkerTask, ) -> Result, Error> { @@ -198,8 +198,8 @@ impl PullSource for RemoteSource { "backup-id": group.id, }); - if !self.ns.is_root() { - args["ns"] = serde_json::to_value(&self.ns)?; + if !namespace.is_root() { + args["ns"] = serde_json::to_value(&namespace)?; } self.client.login().await?;