Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
George Melikov 2021-01-28 04:33:30 +03:00 committed by Tony Hutter
parent e68e938f54
commit e26776f14c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/zfs-tests/tests/functional/procfs/pool_state.ksh
View File

@ -61,16 +61,18 @@ function cleanup
log_must rm -f $BACKUP log_must rm -f $BACKUP
fi fi
# Our disk is back. Now we can clear errors and destroy the if poolexists $TESTPOOL2 ; then
# pool cleanly. # Our disk is back. Now we can clear errors and destroy the
log_must zpool clear $TESTPOOL2 # pool cleanly.
log_must zpool clear $TESTPOOL2
# Now that the disk is back and errors cleared, wait for our # Now that the disk is back and errors cleared, wait for our
# hung 'zpool scrub' to finish. # hung 'zpool scrub' to finish.
wait wait
destroy_pool $TESTPOOL2 destroy_pool $TESTPOOL2
log_must rm $REALDISK fi
log_must rm -f $REALDISK
unload_scsi_debug unload_scsi_debug
fi fi
} }