c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-26 19:19:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: fix raidz_expand_001_pos and raidz_expand_002_pos

Browse Source 
Sometimes the pool may start an auto scrub.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #16537
This commit is contained in:
Tino Reichardt 2024-08-06 20:37:27 +02:00 committed by Brian Behlendorf
parent 4999f49513
commit 5cb3e2861e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
View File

@ -154,7 +154,9 @@ function test_scrub # <pool> <parity> <dir>
log_must zpool import -o cachefile=none -d $dir $pool log_must zpool import -o cachefile=none -d $dir $pool
is_pool_scrubbing $pool && wait_scrubbed $pool
log_must zpool scrub -w $pool log_must zpool scrub -w $pool
log_must zpool clear $pool log_must zpool clear $pool
log_must zpool export $pool log_must zpool export $pool
@ -166,6 +168,7 @@ function test_scrub # <pool> <parity> <dir>
log_must zpool import -o cachefile=none -d $dir $pool log_must zpool import -o cachefile=none -d $dir $pool
is_pool_scrubbing $pool && wait_scrubbed $pool
log_must zpool scrub -w $pool log_must zpool scrub -w $pool
log_must check_pool_status $pool "errors" "No known data errors" log_must check_pool_status $pool "errors" "No known data errors"

1
tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
View File

@ -105,6 +105,7 @@ for disk in ${disks[$(($nparity+2))..$devs]}; do
log_fail "pool $pool not expanded" log_fail "pool $pool not expanded"
fi fi
is_pool_scrubbing $pool && wait_scrubbed $pool
verify_pool $pool verify_pool $pool
pool_size=$expand_size pool_size=$expand_size