ZTS: fix raidz_expand_001_pos and raidz_expand_002_pos

Sometimes the pool may start an auto scrub. Signed-off-by: Tino Reichardt <milky-zfs@mcmilk.de> Signed-off-by: Tony Hutter <hutter2@llnl.gov>
openzfs · Aug 6, 2024 · 02a14e7 · 02a14e7
1 parent 961dd62
commit 02a14e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
@@ -154,7 +154,9 @@ function test_scrub # <pool> <parity> <dir>
 
 	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 clear $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
 
+	is_pool_scrubbing $pool && wait_scrubbed $pool
 	log_must zpool scrub -w $pool
 
 	log_must check_pool_status $pool "errors" "No known data errors"

diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
@@ -105,6 +105,7 @@ for disk in ${disks[$(($nparity+2))..$devs]}; do
 		log_fail "pool $pool not expanded"
 	fi
 
+	is_pool_scrubbing $pool && wait_scrubbed $pool
 	verify_pool $pool
 
 	pool_size=$expand_size