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

storage : vdisk_free : eval parse_volname

Browse Source 
If the storage have some customs volumes name, vdisk_free will hang

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-02-05 12:55:28 +01:00
committed by Dietmar Maurer
parent d67264f17d
commit f104d1dd07
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/Storage.pm
View File

@ -528,11 +528,15 @@ sub vdisk_free {
my $vollist = $plugin->list_images($storeid, $scfg);
foreach my $info (@$vollist) {
my (undef, $tmpvolname) = parse_volume_id($info->{volid});
my $basename = undef;
my $basevmid = undef;
my (undef, undef, undef, $basename, $basevmid) =
$plugin->parse_volname($tmpvolname);
eval{
(undef, undef, undef, $basename, $basevmid) =
$plugin->parse_volname($tmpvolname);
};
if ($basename && $basevmid == $vmid && $basename eq $name) {
if ($basename && $basevmid && $basevmid == $vmid && $basename eq $name) {
die "base volume '$volname' is still in use " .
"(use by '$tmpvolname')\n";
}