]> git.proxmox.com Git - mirror_zfs.git/commitdiff
ZTS: zpool offline requires whole disk name
authorJohn Wren Kennedy <john.kennedy@delphix.com>
Fri, 24 Jan 2020 05:14:55 +0000 (22:14 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 24 Jan 2020 05:14:55 +0000 (21:14 -0800)
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 <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Signed-off-by: John Kennedy <john.kennedy@delphix.com>
Closes #9876

tests/zfs-tests/tests/functional/cli_root/zdb/zdb_004_pos.ksh

index b20eee6729aba6fa9e662220eab254c54874cfb0..2c6e6e9be07097ff47deabb020eac9fbb2331ea2 100755 (executable)
@@ -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