proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-05 20:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not add unused disk when already as unused on another storage

Browse Source 
when having an unused disk on a storage for which there are multiple
definitions, we added it again on another storage when that storage
was alphabetically before the already existing one

this happens for example when using our automatically generated
ceph storages: 'pool_ct' and 'pool_vm' and having a vm with
an unused disk

with this patch, we also leave the unused disks in the hash

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2017-11-16 09:20:56 +01:00 committed by Fabian Grünbichler
parent 6a567ae731
commit c449137a04
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PVE/QemuServer.pm
View File

@ -5361,13 +5361,14 @@ sub update_disksize {
my $changes; my $changes;
my $used = {}; # used and unused disks
my $referenced = {};
# Note: it is allowed to define multiple storages with same path (alias), so # Note: it is allowed to define multiple storages with same path (alias), so
# we need to check both 'volid' and real 'path' (two different volid can point # we need to check both 'volid' and real 'path' (two different volid can point
# to the same path). # to the same path).
my $usedpath = {}; my $referencedpath = {};
# update size info # update size info
foreach my $opt (keys %$conf) { foreach my $opt (keys %$conf) {
@ -5376,10 +5377,10 @@ sub update_disksize {
my $volid = $drive->{file}; my $volid = $drive->{file};
next if !$volid; next if !$volid;
$used->{$volid} = 1; $referenced->{$volid} = 1;
if ($volid_hash->{$volid} && if ($volid_hash->{$volid} &&
(my $path = $volid_hash->{$volid}->{path})) { (my $path = $volid_hash->{$volid}->{path})) {
$usedpath->{$path} = 1; $referencedpath->{$path} = 1;
} }
next if drive_is_cdrom($drive); next if drive_is_cdrom($drive);
@ -5399,21 +5400,24 @@ sub update_disksize {
next if $opt !~ m/^unused\d+$/; next if $opt !~ m/^unused\d+$/;
my $volid = $conf->{$opt}; my $volid = $conf->{$opt};
my $path = $volid_hash->{$volid}->{path} if $volid_hash->{$volid}; my $path = $volid_hash->{$volid}->{path} if $volid_hash->{$volid};
if ($used->{$volid} || ($path && $usedpath->{$path})) { if ($referenced->{$volid} || ($path && $referencedpath->{$path})) {
$changes = 1; $changes = 1;
delete $conf->{$opt}; delete $conf->{$opt};
} }
$referenced->{$volid} = 1;
$referencedpath->{$path} = 1 if $path;
} }
foreach my $volid (sort keys %$volid_hash) { foreach my $volid (sort keys %$volid_hash) {
next if $volid =~ m/vm-$vmid-state-/; next if $volid =~ m/vm-$vmid-state-/;
next if $used->{$volid}; next if $referenced->{$volid};
my $path = $volid_hash->{$volid}->{path}; my $path = $volid_hash->{$volid}->{path};
next if !$path; # just to be sure next if !$path; # just to be sure
next if $usedpath->{$path}; next if $referencedpath->{$path};
$changes = 1; $changes = 1;
PVE::QemuConfig->add_unused_volume($conf, $volid); PVE::QemuConfig->add_unused_volume($conf, $volid);
$usedpath->{$path} = 1; # avoid to add more than once (aliases) $referencedpath->{$path} = 1; # avoid to add more than once (aliases)
} }
return $changes; return $changes;