diff options
| author | George Melikov <mail@gmelikov.ru> | 2021-01-28 04:33:30 +0300 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2021-06-23 13:22:15 -0700 |
| commit | e26776f14ccddc8086d22d0ae607da5a0ca84102 (patch) | |
| tree | 5da8e7492fb418ac9431ba8d1f32089f7dc73775 | |
| parent | e68e938f54c7f615e10cdf956c3bdf63fa6100d9 (diff) | |
ZTS: pool_state test check for pool existence in cleanup
If there is no scsi_debug module, then this test
must be skipped, in this case cleanup routine should
be prepared for absent pool.
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Melikov <mail@gmelikov.ru>
Closes #11534
| -rwxr-xr-x | tests/zfs-tests/tests/functional/procfs/pool_state.ksh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh index f4df839be..080fdddb2 100755 --- a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh +++ b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh @@ -61,16 +61,18 @@ function cleanup log_must rm -f $BACKUP fi - # Our disk is back. Now we can clear errors and destroy the - # pool cleanly. - log_must zpool clear $TESTPOOL2 + if poolexists $TESTPOOL2 ; then + # Our disk is back. Now we can clear errors and destroy the + # pool cleanly. + log_must zpool clear $TESTPOOL2 - # Now that the disk is back and errors cleared, wait for our - # hung 'zpool scrub' to finish. - wait + # Now that the disk is back and errors cleared, wait for our + # hung 'zpool scrub' to finish. + wait - destroy_pool $TESTPOOL2 - log_must rm $REALDISK + destroy_pool $TESTPOOL2 + fi + log_must rm -f $REALDISK unload_scsi_debug fi } |