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

fix bug #664

Browse Source 
Catch the error, if the dataset doesn't exists.
If it will not catched, you can't remove a VM.
This commit is contained in:
Wolfgang Link
2015-07-23 13:22:27 +02:00
committed by Dietmar Maurer
parent 205e81339f
commit 27ff0e99e2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -338,6 +338,9 @@ sub zfs_delete_zvol {
if ($err = $@) {
if ($err =~ m/^zfs error:(.*): dataset is busy.*/) {
sleep(1);
} elsif ($err =~ m/^zfs error:.*: dataset does not exist.*$/) {
$err = undef;
last;
} else {
die $err;
}

2
changelog.Debian
View File

@ -2,6 +2,8 @@ libpve-storage-perl (4.0-13) unstable; urgency=medium
* mask world r and group wx permissions in vdisk_alloc
* fix bug #664
-- Proxmox Support Team <support@proxmox.com> Thu, 30 Jul 2015 08:50:33 +0200
libpve-storage-perl (4.0-12) unstable; urgency=medium