[pve-devel] [PATCH_V6] Bug Fix #602: now zfs will wait 5 sec if error msg is "dataset is busy"

[Wolfgang Link]

Signed-off-by: Wolfgang Link <w.link at proxmox.com>
---
 PVE/Storage/ZFSPoolPlugin.pm |   20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 5cbd1b2..d187e23 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -166,7 +166,7 @@ sub zfs_request {
         $msg .= "$line\n";
     };
 
-    run_command($cmd, outfunc => $output, timeout => $timeout);
+    run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);
 
     return $msg;
 }
@@ -291,7 +291,23 @@ sub zfs_create_zvol {
 sub zfs_delete_zvol {
     my ($class, $scfg, $zvol) = @_;
 
-    $class->zfs_request($scfg, undef, 'destroy', '-r', "$scfg->{pool}/$zvol");
+    my $err;
+
+    for (my $i = 0; $i < 6; $i++) {
+
+	eval { $class->zfs_request($scfg, undef, 'destroy', '-r', "$scfg->{pool}/$zvol"); };
+	if ($err = $@) {
+	    if ($err =~ m/^zfs error:(.*): dataset is busy.*/) {
+		sleep(1);
+	    } else {
+		die $err;
+	    }
+	} else {
+	    last;
+	}
+    }
+
+    die $err if $err;
 }
 
 sub zfs_list_zvol {
-- 
1.7.10.4