From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 30 Jul 2018 16:23:45 +0000 (-0700)
Subject: ZTS: Fix reservation_017_pos
X-Git-Tag: zfs-0.8.0-rc1~70
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b719768e35fdd6d4052546338453cee0713a1a3c;p=zfs

ZTS: Fix reservation_017_pos

It's possible for an unrelated process, like blkid, to have the
volume open when 'zfs destroy' is run.  Switch the cleanup function
to the destroy_dataset() helper which handles this case by retrying
the destroy when the dataset is busy.

Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #7750
---

diff --git a/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh b/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
index dc31c5a8f..bb3af67d2 100755
--- a/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
+++ b/tests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh
@@ -55,7 +55,7 @@ function cleanup
 	typeset vol
 
 	for vol in $regvol $sparsevol; do
-		datasetexists $vol &&  log_must zfs destroy $vol
+		destroy_dataset $vol
 	done
 }
 log_onexit cleanup