summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Wren Kennedy <[email protected]>2020-01-23 22:14:55 -0700
committerBrian Behlendorf <[email protected]>2020-01-23 21:14:55 -0800
commit0d37c2bb2eea2820309675ce9e2593404c5d94f0 (patch)
treefce768388d780bf205e60ffb3c9b92f075cfe119
parent20ea8540a68ff183f273fc642ac498ccd182d58e (diff)
ZTS: zpool offline requires whole disk name
When used with non-loop devices, zdb_004_pos fails because the disk argument provided is the partition rather than the expected whole disk name. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Signed-off-by: John Kennedy <[email protected]> Closes #9876
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh
index b20eee672..2c6e6e9be 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh
@@ -13,6 +13,7 @@
#
# Copyright (c) 2017 by Lawrence Livermore National Security, LLC.
+# Copyright (c) 2020 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
@@ -54,12 +55,13 @@ fi
verify_runnable "global"
verify_disk_count "$DISKS" 2
set -A DISK $DISKS
+WHOLE_DISK=${DISK[0]}
default_mirror_setup_noexit $DISKS
DEVS=$(get_pool_devices ${TESTPOOL} ${DEV_RDSKDIR})
[[ -n $DEVS ]] && set -A DISK $DEVS
-log_must zpool offline $TESTPOOL ${DISK[0]}
+log_must zpool offline $TESTPOOL $WHOLE_DISK
log_must dd if=/dev/urandom of=$TESTDIR/testfile bs=1K count=2
log_must zpool export $TESTPOOL