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 6E225B4127 for ; Thu, 30 Nov 2023 12:01:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 546EF13EBA for ; Thu, 30 Nov 2023 12:01:23 +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 12:01:22 +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 8D05F41CE7 for ; Thu, 30 Nov 2023 12:01:22 +0100 (CET) Message-ID: <375d3de4-3518-4ec4-82bc-a30a64434eec@proxmox.com> Date: Thu, 30 Nov 2023 12:01:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: pbs-devel@lists.proxmox.com References: <20231130105039.568136-1-f.gruenbichler@proxmox.com> From: Philipp Hufnagl In-Reply-To: <20231130105039.568136-1-f.gruenbichler@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.045 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 - Subject: Re: [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 11:01:23 -0000 Fixes the Issue in both directions, LGTM Tested-by: Philipp Hufnagl On 11/30/23 11:50, Fabian Grünbichler wrote: > 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);