From: John Wren Kennedy <jwk404@gmail.com>
Date: Fri, 15 Feb 2019 20:45:46 +0000 (-0700)
Subject: ZTS: clone_001_pos fails in cleanup on busy dataset
X-Git-Tag: zfs-0.8.0-rc4~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07237a7bc1eab62d8bb2bb7b4abafe7a2fd3a482;p=zfs

ZTS: clone_001_pos fails in cleanup on busy dataset

The "cleanup_all" function in this test calls "zfs destroy" which
fails approximately 30% of the time in our environment due to the
dataset being busy. Since the failure happens during cleanup, the
error is propagated to subsequent tests.

Tested by running the snapshot test group in a loop without seeing
any failures.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: John Kennedy <john.kennedy@delphix.com>
Closes #8409
---

diff --git a/tests/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh b/tests/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
index 4ba853162..526897193 100755
--- a/tests/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/snapshot/clone_001_pos.ksh
@@ -75,7 +75,7 @@ function cleanup_all
 	i=0
 	while (( i < ${#args[*]} )); do
 		snapexists ${args[i]} && \
-			log_must zfs destroy -Rf ${args[i]}
+			destroy_dataset "${args[i]}" "-Rf"
 
 		[[ -d ${args[i+3]} ]] && \
 			log_must rm -rf ${args[i+3]}