diff options
| author | John Wren Kennedy <[email protected]> | 2019-02-19 12:12:47 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-02-19 11:12:47 -0800 |
| commit | 435637d1ed9ad8c6e521786f343c5ade7ce552c4 (patch) | |
| tree | 3286885bb90f68bb187018141dd543a3a45ffd74 /tests | |
| parent | 11f6127aba6b9aa54bc86e70581aebeb7d160db4 (diff) | |
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 <[email protected]>
Reviewed-by: Igor Kozhukhov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: John Kennedy <[email protected]>
Closes #8422
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zfs_set/user_property_002_pos.ksh | 6 |
1 files 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 310d1540a..12cff78ea 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 |