From 756c58cf71e4e87d68265d5d5445ec3ff88763aa Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Sat, 28 Dec 2019 08:43:23 -0800 Subject: [PATCH] ZTS: Fix pool_state cleanup The externally faulted vdev should be brought back online and have its errors cleared before the pool is destroyed. Failure to do so will leave a vdev with a valid active label. This vdev may then not be used to create a new pool without the -f flag potentially leading to subsequent test failures. Additionally remove an unreachable log_pass from setup.ksh. Reviewed-by: John Kennedy Reviewed-by: Kjeld Schouten Signed-off-by: Brian Behlendorf Closes #9777 --- tests/zfs-tests/tests/functional/procfs/pool_state.ksh | 4 +++- tests/zfs-tests/tests/functional/procfs/setup.ksh | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh index 6543f87c46..f4df839be6 100755 --- a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh +++ b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh @@ -105,8 +105,10 @@ check_all $TESTPOOL "ONLINE" # Fault one of the disks, and check that pool is degraded DISK1=$(echo "$DISKS" | awk '{print $2}') -zpool offline -tf $TESTPOOL $DISK1 +log_must zpool offline -tf $TESTPOOL $DISK1 check_all $TESTPOOL "DEGRADED" +log_must zpool online $TESTPOOL $DISK1 +log_must zpool clear $TESTPOOL # Create a new pool out of a scsi_debug disk TESTPOOL2=testpool2 diff --git a/tests/zfs-tests/tests/functional/procfs/setup.ksh b/tests/zfs-tests/tests/functional/procfs/setup.ksh index b3812dbdc6..3444cfcf2f 100755 --- a/tests/zfs-tests/tests/functional/procfs/setup.ksh +++ b/tests/zfs-tests/tests/functional/procfs/setup.ksh @@ -31,4 +31,3 @@ if ! is_linux ; then fi default_mirror_setup $DISKS -log_pass