summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2018-08-17 10:01:47 -0700
committerGitHub <[email protected]>2018-08-17 10:01:47 -0700
commit802715b74a23a58d66028699a99eb141c85b7447 (patch)
tree0d174a5737beb93f84ccd496a865f226323f2ce7
parent4338c5c06fbe92fdef9a5f0f7e457fae98c94b4d (diff)
ZTS: Fix reservation_001_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: George Melikov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #7796
-rwxr-xr-xtests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh b/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
index d142fe0cc..b72b8e4a3 100755
--- a/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
+++ b/tests/zfs-tests/tests/functional/reservation/reservation_001_pos.sh
@@ -54,7 +54,7 @@ verify_runnable "both"
function cleanup
{
for obj in $OBJ_LIST; do
- datasetexists $obj && log_must zfs destroy -f $obj
+ destroy_dataset $obj
done
}