summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2020-05-23 17:13:42 -0700
committerGitHub <[email protected]>2020-05-23 17:13:42 -0700
commitc946d5a91329b075fb9bda1ac703a2e85139cf1c (patch)
tree5d810c36c86497c21f9ba7e85fe38304185c3f84
parentfb822260b19921985a5312f7306b0ee0e30eb3b0 (diff)
ZTS: Fix zfs_mount.kshlib cleanup
Update cleanup_filesystem to use destroy_dataset when performing cleanup. This ensures the destroy is retried if the pool is busy preventing occasional failures. Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #10358
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
index 2afb9a547..bd45fabbc 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib
@@ -110,7 +110,7 @@ function cleanup_filesystem #pool #fs
if datasetexists "$pool/$fs" ; then
mtpt=$(get_prop mountpoint "$pool/$fs")
- log_must zfs destroy -r $pool/$fs
+ destroy_dataset "$pool/$fs" "-r"
[[ -d $mtpt ]] && \
log_must rm -rf $mtpt