public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [RFC/PATCH pmg-api 2/2] api: pbs: don't use namespaced parameters
Date: Wed, 20 Jul 2022 12:59:47 +0200	[thread overview]
Message-ID: <20220720105948.291740-8-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220720105948.291740-1-f.ebner@proxmox.com>

Instead, rely on PBSClient to set namespace according to the initial
configuration.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---

Dependency bump for new libpve-common-perl needed.

 src/PMG/API2/PBS/Job.pm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/PMG/API2/PBS/Job.pm b/src/PMG/API2/PBS/Job.pm
index be9cc06..e49753c 100644
--- a/src/PMG/API2/PBS/Job.pm
+++ b/src/PMG/API2/PBS/Job.pm
@@ -19,14 +19,6 @@ use PMG::PBSSchedule;
 
 use base qw(PVE::RESTHandler);
 
-my sub get_namespace : prototype($) {
-    my ($remote_config) = @_;
-    if (my $ns = $remote_config->{namespace}) {
-	return $ns if length($ns); # don't pass root namespace
-    }
-    return undef;
-}
-
 __PACKAGE__->register_method ({
     name => 'list',
     path => '',
@@ -111,10 +103,9 @@ my sub get_snapshots {
     my $res = [];
     return $res if $remote_config->{disable};
 
-    my $namespace = get_namespace($remote_config);
     my $pbs = PVE::PBSClient->new($remote_config, $remote, $conf->{secret_dir});
 
-    my $snapshots = $pbs->get_snapshots([$namespace, $group]);
+    my $snapshots = $pbs->get_snapshots($group);
     foreach my $item (@$snapshots) {
 	my ($type, $id, $time) = $item->@{qw(backup-type backup-id backup-time)};
 	next if $type ne 'host';
@@ -252,9 +243,8 @@ __PACKAGE__->register_method ({
 	die "PBS remote '$remote' is disabled\n" if $remote_config->{disable};
 
 	my $pbs = PVE::PBSClient->new($remote_config, $remote, $conf->{secret_dir});
-	my $namespace = get_namespace($remote_config);
 
-	eval { $pbs->forget_snapshot([$namespace, "host/$id/$time"]) };
+	eval { $pbs->forget_snapshot("host/$id/$time") };
 	die "Forgetting backup failed: $@" if $@;
 
 	return;
@@ -324,13 +314,11 @@ __PACKAGE__->register_method ({
 
 	    $log->("starting update of current backup state");
 
-	    my $namespace = get_namespace($remote_config);
-
 	    eval {
 		-d $backup_dir || mkdir $backup_dir;
 		PMG::Backup::pmg_backup($backup_dir, $param->{statistic});
 
-		$pbs->backup_fs_tree($backup_dir, $node, 'pmgbackup', undef, $namespace);
+		$pbs->backup_fs_tree($backup_dir, $node, 'pmgbackup');
 
 		rmtree $backup_dir;
 	    };
@@ -345,7 +333,7 @@ __PACKAGE__->register_method ({
 	    my $group = "host/$node";
 	    if (defined(my $prune_opts = $conf->prune_options($remote))) {
 		$log->("starting prune of $group");
-		my $res = eval { $pbs->prune_group(undef, $prune_opts, [$namespace, $group]) };
+		my $res = eval { $pbs->prune_group(undef, $prune_opts, $group) };
 		if (my $err = $@) {
 		    $log->($err);
 		    PMG::Backup::send_backup_notification($notify, $remote, $full_log, $err);
-- 
2.30.2





  parent reply	other threads:[~2022-07-20 11:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-20 10:59 [pmg-devel] [PATCH-SERIES pve-common/pmg-api/pve-storage] pbs client: rework namespace usage and minor fixes Fabian Ebner
2022-07-20 10:59 ` [pmg-devel] [PATCH pve-common 1/5] pbs client: delete password: return success for non-existent file Fabian Ebner
2022-07-20 10:59 ` [pmg-devel] [PATCH pve-common 2/5] pbs client: forget snapshot: suppress output Fabian Ebner
2022-07-20 10:59 ` [pmg-devel] [PATCH pve-common 3/5] pbs client: default to configured namespace for non-namespaced parameters Fabian Ebner
2022-11-04  8:44   ` Fiona Ebner
2022-07-20 10:59 ` [pmg-devel] [RFC/PATCH pve-common 4/5] pbs client: deprecate namespaced parameters Fabian Ebner
2022-07-20 10:59 ` [pmg-devel] [RFC/PATCH pve-common 5/5] pbs client: backup fs tree: drop namespace parameter Fabian Ebner
2022-07-22 10:53   ` [pmg-devel] [pve-devel] " Wolfgang Bumiller
2022-07-25  8:04     ` Fiona Ebner
2022-11-04 13:16   ` [pmg-devel] applied-series: " Wolfgang Bumiller
2022-07-20 10:59 ` [pmg-devel] [PATCH pmg-api 1/2] api: get group snapshots: take backup-id into account Fabian Ebner
2022-11-04 13:28   ` [pmg-devel] applied-series: " Wolfgang Bumiller
2022-07-20 10:59 ` Fabian Ebner [this message]
2022-07-20 10:59 ` [pmg-devel] [RFC/PATCH pve-storage 1/1] api: pbs: file restore: don't use namespaced parameters Fabian Ebner
2022-11-04 13:17   ` [pmg-devel] applied: " Wolfgang Bumiller
2022-10-04  8:08 ` [pmg-devel] [PATCH-SERIES pve-common/pmg-api/pve-storage] pbs client: rework namespace usage and minor fixes Fiona Ebner

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=20220720105948.291740-8-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pmg-devel@lists.proxmox.com \
    --cc=pve-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