From 27ff0e99e27ce371fa567115e41d1876de69d521 Mon Sep 17 00:00:00 2001 From: Wolfgang Link Date: Thu, 23 Jul 2015 13:22:27 +0200 Subject: [PATCH] fix bug #664 Catch the error, if the dataset doesn't exists. If it will not catched, you can't remove a VM. --- PVE/Storage/ZFSPoolPlugin.pm | 3 +++ changelog.Debian | 2 ++ 2 files changed, 5 insertions(+) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 6b095f1..d3bb0fd 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -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; } diff --git a/changelog.Debian b/changelog.Debian index 98a5904..42752be 100644 --- a/changelog.Debian +++ b/changelog.Debian @@ -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 Thu, 30 Jul 2015 08:50:33 +0200 libpve-storage-perl (4.0-12) unstable; urgency=medium