yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #2467: avoid duplicate volumes & tag with correct content type

Browse Source 
The bugfix for #2317 introduced a kind of odd API behavior, where
each volume was returned twice from our API if a storage has both
'rootdir' & 'images' content types enabled. To give the content type
of the volume an actual meaning, it is now inferred from the
associated guest, if there's no guest or we don't have an owner for
that volume we default to 'images'.

At the volume level, there is no option to list volumes based on
content types, since the volumes do not know what type they are
actually used for.

Signed-off-by: Tim Marx <t.marx@proxmox.com>
This commit is contained in:
Tim Marx
2019-11-21 11:43:20 +01:00
committed by Thomas Lamprecht
parent 528aa0eefb
commit 5dae1a319b
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/Storage/Plugin.pm
View File

@ -937,7 +937,7 @@ sub list_volumes {
my ($class, $storeid, $scfg, $vmid, $content_types) = @_;
my $res = [];
my $vmlist = PVE::Cluster::get_vmlist();
foreach my $ct (@$content_types) {
my $data;
@ -960,7 +960,22 @@ sub list_volumes {
next if !$data;
foreach my $item (@$data) {
$item->{content} = $ct;
if ($ct eq 'images' || $ct eq 'rootdir') {
my $vmtype = $vmlist->{ids}->{$item->{vmid}}->{type};
if (defined($vmtype) && $vmtype eq 'lxc') {
$item->{content} = 'rootdir';
} else {
$item->{content} = 'images';
}
if (!($ct eq $item->{content})) {
next;
}
} else {
$item->{content} = $ct;
}
push @$res, $item;
}
}