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 2EA93B4079 for ; Thu, 30 Nov 2023 11:51:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 09EAB13BA8 for ; Thu, 30 Nov 2023 11:50:45 +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:50:44 +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 3697E426F5 for ; Thu, 30 Nov 2023 11:50:44 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 30 Nov 2023 11:50:39 +0100 Message-Id: <20231130105039.568136-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 source store+namespace printing 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:51:15 -0000 previously this would always refer to the "top" namespace of the source, instead of properly iterating over the namespace tree. adapt the trait accordingly, since this was the only call site. this fixes a cosmetic issue only. Signed-off-by: Fabian Grünbichler --- src/server/pull.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index 44d428fd..3b71c156 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -91,7 +91,7 @@ trait PullSource: Send + Sync { worker: &WorkerTask, ) -> Result, Error>; fn get_ns(&self) -> BackupNamespace; - fn print_store_and_ns(&self) -> String; + fn get_store(&self) -> &str; /// Returns a reader for reading data from a specific backup directory. async fn reader( @@ -229,8 +229,8 @@ impl PullSource for RemoteSource { self.ns.clone() } - fn print_store_and_ns(&self) -> String { - print_store_and_ns(self.repo.store(), &self.ns) + fn get_store(&self) -> &str { + &self.repo.store() } async fn reader( @@ -299,8 +299,8 @@ impl PullSource for LocalSource { self.ns.clone() } - fn print_store_and_ns(&self) -> String { - print_store_and_ns(self.store.name(), &self.ns) + fn get_store(&self) -> &str { + self.store.name() } async fn reader( @@ -1269,7 +1269,7 @@ pub(crate) async fn pull_store( let mut synced_ns = HashSet::with_capacity(namespaces.len()); for namespace in namespaces { - let source_store_ns_str = params.source.print_store_and_ns(); + let source_store_ns_str = print_store_and_ns(params.source.get_store(), &namespace); let target_ns = namespace.map_prefix(¶ms.source.get_ns(), ¶ms.target.ns)?; let target_store_ns_str = print_store_and_ns(params.target.store.name(), &target_ns); -- 2.39.2