fix bug #664

Catch the error, if the dataset doesn't exists.
If it will not catched, you can't remove a VM.

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 6b095f1b62bceaccf5d8118ab0354b9563346b60..d3bb0fd4e52995a2d9c3c4dc9ed265e243efcd9a 100644 (file)
--- 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 98a5904fb471a24c709ff2ab83fd2af1c610d743..42752be4aae47c82615ff953820c9da40cf1bcad 100644 (file)
--- 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 <support@proxmox.com>  Thu, 30 Jul 2015 08:50:33 +0200
 
 libpve-storage-perl (4.0-12) unstable; urgency=medium