public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Philipp Hufnagl <p.hufnagl@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup] sync: fix source store+namespace printing
Date: Thu, 30 Nov 2023 12:01:21 +0100	[thread overview]
Message-ID: <375d3de4-3518-4ec4-82bc-a30a64434eec@proxmox.com> (raw)
In-Reply-To: <20231130105039.568136-1-f.gruenbichler@proxmox.com>

Fixes the Issue in both directions, LGTM

Tested-by: Philipp Hufnagl <p.hufnagl@proxmox.com>

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 <f.gruenbichler@proxmox.com>
> ---
>  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<Vec<BackupDir>, 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(&params.source.get_ns(), &params.target.ns)?;
>          let target_store_ns_str = print_store_and_ns(params.target.store.name(), &target_ns);




      parent reply	other threads:[~2023-11-30 11:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-30 10:50 Fabian Grünbichler
2023-11-30 10:57 ` Dominik Csapak
2023-11-30 10:57 ` [pbs-devel] applied: " Thomas Lamprecht
2023-11-30 11:01 ` Philipp Hufnagl [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=375d3de4-3518-4ec4-82bc-a30a64434eec@proxmox.com \
    --to=p.hufnagl@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal