[pve-devel] [RFC/PATCH pve-common 5/5] pbs client: backup fs tree: drop namespace parameter

Wolfgang Bumiller w.bumiller at proxmox.com
Fri Jul 22 12:53:28 CEST 2022


On Wed, Jul 20, 2022 at 12:59:45PM +0200, Fabian Ebner wrote:
> Instead, use the one from the initial configuration. The only current
> caller is in PMG and the namespace parameter set there agrees with
> the one from the initial configuration, so this is not actually a
> breaking change.

Still technically a breaking change ;-)

> 
> Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
> ---
>  src/PVE/PBSClient.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/PVE/PBSClient.pm b/src/PVE/PBSClient.pm
> index 34d3f67..d7dd6e1 100644
> --- a/src/PVE/PBSClient.pm
> +++ b/src/PVE/PBSClient.pm
> @@ -274,7 +274,7 @@ sub get_snapshots {
>  # create a new PXAR backup of a FS directory tree - doesn't cross FS boundary
>  # by default.
>  sub backup_fs_tree {
> -    my ($self, $root, $id, $pxarname, $cmd_opts, $namespace) = @_;
> +    my ($self, $root, $id, $pxarname, $cmd_opts) = @_;

And in theory the namespace *could* be overwritable via `$cmd_opts` (if
we used `//=` below.

But even better yet, since it's not used anywhere, maybe we should just
drop `$cmd_opts` entirely?

>  
>      die "backup-id not provided\n" if !defined($id);
>      die "backup root dir not provided\n" if !defined($root);
> @@ -288,7 +288,7 @@ sub backup_fs_tree {
>  
>      $cmd_opts //= {};
>  
> -    $cmd_opts->{namespace} = $namespace if defined($namespace);
> +    $cmd_opts->{namespace} = $self->{scfg}->{namespace} if defined($self->{scfg}->{namespace});
>  
>      return run_raw_client_cmd($self, 'backup', $param, %$cmd_opts);
>  };
> -- 
> 2.30.2





More information about the pve-devel mailing list