Skip to content

Commit 3ae732d

Browse files
mcmilklundman
authored andcommitted
ZTS: fix raidz_expand_001_pos and raidz_expand_002_pos
Sometimes the pool may start an auto scrub. Reviewed by: Brian Behlendorf <[email protected]> Signed-off-by: Tino Reichardt <[email protected]> Signed-off-by: Tony Hutter <[email protected]> Closes openzfs#16537
1 parent 80136ae commit 3ae732d

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ function test_scrub # <pool> <parity> <dir>
154154

155155
log_must zpool import -o cachefile=none -d $dir $pool
156156

157+
is_pool_scrubbing $pool && wait_scrubbed $pool
157158
log_must zpool scrub -w $pool
159+
158160
log_must zpool clear $pool
159161
log_must zpool export $pool
160162

@@ -166,6 +168,7 @@ function test_scrub # <pool> <parity> <dir>
166168

167169
log_must zpool import -o cachefile=none -d $dir $pool
168170

171+
is_pool_scrubbing $pool && wait_scrubbed $pool
169172
log_must zpool scrub -w $pool
170173

171174
log_must check_pool_status $pool "errors" "No known data errors"

tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ for disk in ${disks[$(($nparity+2))..$devs]}; do
105105
log_fail "pool $pool not expanded"
106106
fi
107107

108+
is_pool_scrubbing $pool && wait_scrubbed $pool
108109
verify_pool $pool
109110

110111
pool_size=$expand_size

0 commit comments

Comments
 (0)