Proxmox-Port/pve-storage
1
0
Fork 0
mirror of https://github.com/jiangcuo/pve-storage.git synced 2025-08-27 09:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pbs: use vmid parameter in list_snapshots

Browse Source 
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>
This commit is contained in:
Wolfgang Bumiller 2022-07-14 13:24:10 +02:00 committed by Thomas Lamprecht
parent 0d4c46bf35
commit af07f67a89
1 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
PVE/Storage/PBSPlugin.pm
View File

@ -676,6 +676,37 @@ my sub snapshot_files_encrypted {
return $any && $all; 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 { sub list_volumes {
my ($class, $storeid, $scfg, $vmid, $content_types) = @_; my ($class, $storeid, $scfg, $vmid, $content_types) = @_;
@ -683,7 +714,14 @@ sub list_volumes {
return $res if !grep { $_ eq 'backup' } @$content_types; 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) { foreach my $item (@$data) {
my $btype = $item->{"backup-type"}; my $btype = $item->{"backup-type"};
@ -745,37 +783,6 @@ sub status {
return ($total, $free, $used, $active); 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 # can also be used for not (yet) added storages, pass $scfg with
# { # {
# server # server