summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2018-07-30 09:23:45 -0700
committerGitHub <[email protected]>2018-07-30 09:23:45 -0700
commitb719768e35fdd6d4052546338453cee0713a1a3c (patch)
treeda23d1e1269b1fb6962e1e69c89de70c1af53942
parent11d0525cbb15a3519df683ec0248b6ac55f9d090 (diff)
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 <[email protected]> Reviewed-by: George Melikov <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #7750
-rwxr-xr-xtests/zfs-tests/tests/functional/reservation/reservation_017_pos.sh2
1 files changed, 1 insertions, 1 deletions
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