c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 10:01:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 7761 - bootfs_005_neg's pool destruction must handle EBUSY

Browse Source 
Authored by: Prakash Surya <prakash.surya@delphix.com>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

OpenZFS-issue: https://www.illumos.org/issues/7761
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/ad309d3
Closes #5818
This commit is contained in:
Prakash Surya 2017-01-11 16:36:58 -08:00 committed by Brian Behlendorf
parent 0efd97912a
commit cbeeb4afb3
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/zfs-tests/tests/functional/bootfs/bootfs_005_neg.ksh
View File

@ -26,7 +26,7 @@
#
#
# Copyright (c) 2012, 2015 by Delphix. All rights reserved.
# Copyright (c) 2012, 2017 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
@ -53,14 +53,10 @@ function cleanup {
typeset pool_name
for config in $CONFIGS; do
pool_name=$(eval $ECHO \$ZPOOL_VERSION_${config}_NAME)
if poolexists $pool_name; then
log_must $ZPOOL destroy $pool_name
fi
destroy_pool $pool_name
done
if poolexists $TESTPOOL ; then
log_must $ZPOOL destroy $TESTPOOL
fi
destroy_pool $TESTPOOL
}
log_assert "Boot properties cannot be set on pools with older versions"

6
tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade.kshlib
View File

@ -25,7 +25,7 @@
#
#
# Copyright (c) 2012 by Delphix. All rights reserved.
# Copyright (c) 2012, 2017 by Delphix. All rights reserved.
# Copyright 2015 Nexenta Systems, Inc. All rights reserved.
#
@ -93,9 +93,7 @@ function destroy_upgraded_pool
typeset -n pool_files=ZPOOL_VERSION_${vers}_FILES
typeset -n pool_name=ZPOOL_VERSION_${vers}_NAME
if poolexists $pool_name; then
log_must $ZPOOL destroy $pool_name
fi
destroy_pool $pool_name
for file in $pool_files; do
$RM -f /$TESTPOOL/$file
done