c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-05-09 02:08:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up correctly in zpool_scrub_004_pos

Browse Source 
Ensure `zinject -c` all gets called whenever
zpool_scrub_004_pos exits.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Issue #5444
Closes #6021
This commit is contained in:
Giuseppe Di Natale 2017-04-18 09:45:45 -07:00 committed by Brian Behlendorf
parent 6faad211e3
commit f995e5ec43
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh
View File

@ -46,6 +46,11 @@
# resilver does not complete before the scrub can be issued. This # resilver does not complete before the scrub can be issued. This
# can occur when testing with small pools or very fast hardware. # can occur when testing with small pools or very fast hardware.
function cleanup
{
log_must zinject -c all
}
verify_runnable "global" verify_runnable "global"
# See issue: https://github.com/zfsonlinux/zfs/issues/5444 # See issue: https://github.com/zfsonlinux/zfs/issues/5444
@ -53,6 +58,8 @@ if is_32bit; then
log_unsupported "Test case fails on 32-bit systems" log_unsupported "Test case fails on 32-bit systems"
fi fi
log_onexit cleanup
log_assert "Resilver prevent scrub from starting until the resilver completes" log_assert "Resilver prevent scrub from starting until the resilver completes"
log_must zpool detach $TESTPOOL $DISK2 log_must zpool detach $TESTPOOL $DISK2
@ -66,5 +73,4 @@ while ! is_pool_resilvered $TESTPOOL; do
sleep 1 sleep 1
done done
log_must zinject -c all
log_pass "Resilver prevent scrub from starting until the resilver completes" log_pass "Resilver prevent scrub from starting until the resilver completes"