diff options
| author | Brian Behlendorf <[email protected]> | 2019-10-11 10:22:20 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-10-11 10:22:20 -0700 |
| commit | ea25ed236500f67235a9a692b4ea8a6f53a88dea (patch) | |
| tree | 007be2fe30733a2e1874ac4d55eb9e1850cb5ac2 | |
| parent | 516a83f8861269de9f795a96c471623e3bd67009 (diff) | |
ZTS: Fix zpool_status_-s
After commit 5e74ac51 which split and reordered the run files the
`zpool_status_-s` test began failing. The new ordering placed
the test after a previous test which used `zpool replace` to replace
a disk but did not clear its label. This resulted in the next test,
`zpool_status_-s`, failing because of the potentially active
pool being detected on the replaced vdev.
/dev/loop0 is part of potentially active pool 'testpool'
Use the default_mirror_setup_noexit() and default_cleanup_noexit()
functions to create the pool in `zpool_status_-s`. They use the -f
flag by default.
In the `scrub_after_resilver` test wipe the label during cleanup
to prevent future failures if the tests are again reordered.
Reviewed-by: Igor Kozhukhov <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #9451
| -rwxr-xr-x | tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh | 1 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh index a5b58ec8f..db4a4ad55 100755 --- a/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh +++ b/tests/zfs-tests/tests/functional/fault/scrub_after_resilver.ksh @@ -42,6 +42,7 @@ function cleanup # Restore our zed.rc log_must zed_rc_restore $zedrc_backup default_cleanup_noexit + log_must zpool labelclear -f $DISK1 } log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh b/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh index b6a3e71fd..c919ae608 100755 --- a/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh +++ b/tests/zfs-tests/tests/functional/fault/zpool_status_-s.ksh @@ -41,14 +41,14 @@ DISK=${DISKS%% *} verify_runnable "both" -log_must zpool create $TESTPOOL mirror ${DISKS} +default_mirror_setup_noexit $DISKS function cleanup { log_must zinject -c all log_must set_tunable64 zio_slow_io_ms $OLD_SLOW_IO log_must set_tunable64 zfs_slow_io_events_per_second $OLD_SLOW_IO_EVENTS - log_must destroy_pool $TESTPOOL + default_cleanup_noexit } log_onexit cleanup |