c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-10-26 18:05:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Polish online_offline tests

Browse Source 
- Kill workload first for faster cleanup.
 - Use `zpool wait` for resilver instead of `sleep`.
 - Remove irrelevant workload from `online_offline_003_neg`.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by:	Alexander Motin <mav@FreeBSD.org>
Sponsored by:	iXsystems, Inc.
Closes: #17259
(cherry picked from commit cb49e7701f)
This commit is contained in:
Alexander Motin 2025-04-22 21:02:31 -04:00 committed by Tony Hutter
parent 95df01020d
commit 03ac770008
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/zfs-tests/tests/functional/online_offline/online_offline_001_pos.ksh
View File

@ -50,16 +50,17 @@ DISKLIST=$(get_disklist $TESTPOOL)
function cleanup function cleanup
{ {
kill $killpid >/dev/null 2>&1
# #
# Ensure we don't leave disks in the offline state # Ensure we don't leave disks in the offline state
# #
for disk in $DISKLIST; do for disk in $DISKLIST; do
log_must zpool online $TESTPOOL $disk log_must zpool online $TESTPOOL $disk
log_must check_state $TESTPOOL $disk "online" log_must check_state $TESTPOOL $disk "online"
done done
log_must zpool wait -t resilver $TESTPOOL
kill $killpid >/dev/null 2>&1
[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/* [[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
} }
@ -77,8 +78,7 @@ for disk in $DISKLIST; do
log_must zpool online $TESTPOOL $disk log_must zpool online $TESTPOOL $disk
log_must check_state $TESTPOOL $disk "online" log_must check_state $TESTPOOL $disk "online"
# Delay for resilver to complete log_must zpool wait -t resilver $TESTPOOL
sleep 3
done done
log_must kill $killpid log_must kill $killpid

4
tests/zfs-tests/tests/functional/online_offline/online_offline_002_neg.ksh
View File

@ -51,6 +51,8 @@ DISKLIST=$(get_disklist $TESTPOOL)
function cleanup function cleanup
{ {
kill $killpid >/dev/null 2>&1
# #
# Ensure we don't leave disks in the offline state # Ensure we don't leave disks in the offline state
# #
@ -58,8 +60,8 @@ function cleanup
log_must zpool online $TESTPOOL $disk log_must zpool online $TESTPOOL $disk
log_must check_state $TESTPOOL $disk "online" log_must check_state $TESTPOOL $disk "online"
done done
log_must zpool wait -t resilver $TESTPOOL
kill $killpid >/dev/null 2>&1
[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/* [[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
} }

9
tests/zfs-tests/tests/functional/online_offline/online_offline_003_neg.ksh
View File

@ -49,7 +49,6 @@ function cleanup
destroy_pool $TESTPOOL1 destroy_pool $TESTPOOL1
fi fi
kill $killpid >/dev/null 2>&1
[[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/* [[ -e $TESTDIR ]] && log_must rm -rf $TESTDIR/*
} }
@ -59,7 +58,7 @@ log_onexit cleanup
specials_list="" specials_list=""
for i in 0 1 2; do for i in 0 1 2; do
mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i log_must mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i
specials_list="$specials_list $TESTDIR/$TESTFILE1.$i" specials_list="$specials_list $TESTDIR/$TESTFILE1.$i"
done done
disk=($specials_list) disk=($specials_list)
@ -68,15 +67,9 @@ create_pool $TESTPOOL1 $specials_list
log_must zfs create $TESTPOOL1/$TESTFS1 log_must zfs create $TESTPOOL1/$TESTFS1
log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1 log_must zfs set mountpoint=$TESTDIR1 $TESTPOOL1/$TESTFS1
file_trunc -f $((64 * 1024 * 1024)) -b 8192 -c 0 -r $TESTDIR/$TESTFILE1 &
typeset killpid="$! "
for i in 0 1 2; do for i in 0 1 2; do
log_mustnot zpool offline $TESTPOOL1 ${disk[$i]} log_mustnot zpool offline $TESTPOOL1 ${disk[$i]}
check_state $TESTPOOL1 ${disk[$i]} "online" check_state $TESTPOOL1 ${disk[$i]} "online"
done done
log_must kill $killpid
sync_all_pools
log_pass log_pass