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
This commit is contained in:
John Wren Kennedy 2019-02-19 12:12:47 -07:00 committed by Brian Behlendorf
parent 11f6127aba
commit 435637d1ed
1 changed files with 2 additions and 4 deletions

View File

@ -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