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 E89B87C0E9 for ; Thu, 14 Jul 2022 13:24:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DB2C21C384 for ; Thu, 14 Jul 2022 13:24:11 +0200 (CEST) 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, 14 Jul 2022 13:24:11 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1276D421EB for ; Thu, 14 Jul 2022 13:24:11 +0200 (CEST) From: Wolfgang Bumiller To: pve-devel@lists.proxmox.com Date: Thu, 14 Jul 2022 13:24:10 +0200 Message-Id: <20220714112410.150830-1-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.286 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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. [pbsplugin.pm] Subject: [pve-devel] [PATCH storage] pbs: use vmid parameter in list_snapshots X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2022 11:24:41 -0000 Particularly for operations such as pruning backups after a scheduled backups we do not want to list the entire store. (pbs_api_connect is moved up unmodified) Note that the 'snapshots' CLI command only takes a full group, but the API does allow specifying a backup-id without a backup-type! Signed-off-by: Wolfgang Bumiller --- PVE/Storage/PBSPlugin.pm | 71 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index d9f2c3e..4c1b58c 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -676,6 +676,37 @@ my sub snapshot_files_encrypted { return $any && $all; } +# TODO: use a client with native rust/proxmox-backup bindings to profit from +# API schema checks and types +my sub pbs_api_connect { + my ($scfg, $password) = @_; + + my $params = {}; + + my $user = $scfg->{username} // 'root@pam'; + + if (my $tokenid = PVE::AccessControl::pve_verify_tokenid($user, 1)) { + $params->{apitoken} = "PBSAPIToken=${tokenid}:${password}"; + } else { + $params->{password} = $password; + $params->{username} = $user; + } + + if (my $fp = $scfg->{fingerprint}) { + $params->{cached_fingerprints}->{uc($fp)} = 1; + } + + my $conn = PVE::APIClient::LWP->new( + %$params, + host => $scfg->{server}, + port => $scfg->{port} // 8007, + timeout => 7, # cope with a 401 (3s api delay) and high latency + cookie_name => 'PBSAuthCookie', + ); + + return $conn; +} + sub list_volumes { my ($class, $storeid, $scfg, $vmid, $content_types) = @_; @@ -683,7 +714,14 @@ sub list_volumes { return $res if !grep { $_ eq 'backup' } @$content_types; - my $data = run_client_cmd($scfg, $storeid, "snapshots"); + my $password = pbs_get_password($scfg, $storeid); + my $conn = pbs_api_connect($scfg, $password); + my $datastore = $scfg->{datastore}; + + my $param = {}; + $param->{'backup-id'} = "$vmid" if defined($vmid); + my $data = eval { $conn->get("/api2/json/admin/datastore/$datastore/snapshots", $param); }; + die "error listing snapshots - $@" if $@; foreach my $item (@$data) { my $btype = $item->{"backup-type"}; @@ -745,37 +783,6 @@ sub status { return ($total, $free, $used, $active); } -# TODO: use a client with native rust/proxmox-backup bindings to profit from -# API schema checks and types -my sub pbs_api_connect { - my ($scfg, $password) = @_; - - my $params = {}; - - my $user = $scfg->{username} // 'root@pam'; - - if (my $tokenid = PVE::AccessControl::pve_verify_tokenid($user, 1)) { - $params->{apitoken} = "PBSAPIToken=${tokenid}:${password}"; - } else { - $params->{password} = $password; - $params->{username} = $user; - } - - if (my $fp = $scfg->{fingerprint}) { - $params->{cached_fingerprints}->{uc($fp)} = 1; - } - - my $conn = PVE::APIClient::LWP->new( - %$params, - host => $scfg->{server}, - port => $scfg->{port} // 8007, - timeout => 7, # cope with a 401 (3s api delay) and high latency - cookie_name => 'PBSAuthCookie', - ); - - return $conn; -} - # can also be used for not (yet) added storages, pass $scfg with # { # server -- 2.30.2