From 435637d1ed9ad8c6e521786f343c5ade7ce552c4 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Tue, 19 Feb 2019 12:12:47 -0700 Subject: [PATCH] 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 Reviewed-by: Igor Kozhukhov Reviewed-by: Giuseppe Di Natale Reviewed-by: Brian Behlendorf Signed-off-by: John Kennedy Closes #8422 --- .../functional/cli_root/zfs_set/user_property_002_pos.ksh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 310d1540a0..12cff78ea4 100755 --- 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