From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D69D7B4073 for ; Thu, 30 Nov 2023 11:43:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B0641139B3 for ; Thu, 30 Nov 2023 11:42:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 30 Nov 2023 11:42:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DB5A442A83 for ; Thu, 30 Nov 2023 11:42:57 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 30 Nov 2023 11:42:53 +0100 Message-Id: <20231130104253.550177-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pull.rs] Subject: [pbs-devel] [PATCH proxmox-backup] sync: fix recursive remote sync X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Nov 2023 10:43:28 -0000 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 --- 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?; -- 2.39.2