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

ZTS: Make fault cleanup function more robust

Browse Source 
The cleanup function of auto_online_001_pos does not account for the
possibility that the test may fail while a disk is still removed. If
the test run is using real disks, cleanup should involve restoring any
that are missing.

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: John Kennedy <john.kennedy@delphix.com>
Closes #8579
This commit is contained in:
John Wren Kennedy 2019-04-12 11:07:20 -06:00 committed by Brian Behlendorf
parent b31cf30a15
commit 9e3485abfc
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/zfs-tests/tests/functional/fault/auto_online_001_pos.ksh
View File

@ -21,6 +21,7 @@
# #
# #
# Copyright (c) 2016, 2017 by Intel Corporation. All rights reserved. # Copyright (c) 2016, 2017 by Intel Corporation. All rights reserved.
# Copyright (c) 2019 by Delphix. All rights reserved.
# #
. $STF_SUITE/include/libtest.shlib . $STF_SUITE/include/libtest.shlib
@ -54,6 +55,15 @@ fi
function cleanup function cleanup
{ {
typeset disk
# Replace any disk that may have been removed at failure time.
for disk in $DISK1 $DISK2 $DISK3; do
# Skip loop devices and devices that currently exist.
is_loop_device $disk && continue
is_real_device $disk && continue
insert_disk $disk $(get_scsi_host $disk)
done
destroy_pool $TESTPOOL destroy_pool $TESTPOOL
unload_scsi_debug unload_scsi_debug
} }