ZTS: user_property_002_pos fails to destroy volume

During the cleanup function of this test, an attempt to destroy a volume
can fail because the volume is busy. This leaves the system with
unexpected datasets which in turn causes subsequent failures.

Reviewed-by: bunder2015 <omfgbunder@gmail.com>
Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: John Kennedy <john.kennedy@delphix.com>
Closes #8422

diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
index 310d1540a0966027136bbd31367c97739cd1c208..12cff78ea4ca273a7c2ebaf40903d3d7acb1c03e 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh
@@ -26,7 +26,7 @@
 #
 
 #
-# Copyright (c) 2016 by Delphix. All rights reserved.
+# Copyright (c) 2016, 2019 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -53,9 +53,7 @@ function cleanup
        typeset dtst
        for dtst in $new_fsclone $new_volclone $fsclone $volclone \
            $fssnap $volsnap; do
-               if datasetexists $dtst; then
-                       log_must zfs destroy -f $dtst
-               fi
+               destroy_dataset "$dtst" "-f"
        done
 
        cleanup_user_prop $pool