From 0d37c2bb2eea2820309675ce9e2593404c5d94f0 Mon Sep 17 00:00:00 2001 From: John Wren Kennedy Date: Thu, 23 Jan 2020 22:14:55 -0700 Subject: [PATCH] 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 Reviewed-by: Ryan Moeller Signed-off-by: John Kennedy Closes #9876 --- tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 b20eee6729..2c6e6e9be0 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