* [pve-devel] [PATCH storage] pbs: use vmid parameter in list_snapshots
@ 2022-07-14 11:24 Wolfgang Bumiller
2022-07-14 11:50 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Wolfgang Bumiller @ 2022-07-14 11:24 UTC (permalink / raw)
To: pve-devel
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 <w.bumiller@proxmox.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pve-devel] applied: [PATCH storage] pbs: use vmid parameter in list_snapshots
2022-07-14 11:24 [pve-devel] [PATCH storage] pbs: use vmid parameter in list_snapshots Wolfgang Bumiller
@ 2022-07-14 11:50 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2022-07-14 11:50 UTC (permalink / raw)
To: Proxmox VE development discussion, Wolfgang Bumiller
Am 14/07/2022 um 13:24 schrieb Wolfgang Bumiller:
> 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 <w.bumiller@proxmox.com>
> ---
> PVE/Storage/PBSPlugin.pm | 71 ++++++++++++++++++++++------------------
> 1 file changed, 39 insertions(+), 32 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-14 11:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-14 11:24 [pve-devel] [PATCH storage] pbs: use vmid parameter in list_snapshots Wolfgang Bumiller
2022-07-14 11:50 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox