From 89f796dec688ab706bb9905b57f7725dc5c2f3ee Mon Sep 17 00:00:00 2001 From: Alexander Motin Date: Fri, 27 Dec 2024 10:01:22 -0500 Subject: [PATCH] ZTS: Increase write sizes for RAIDZ/dRAID tests Many RAIDZ/dRAID tests filled files doing millions of 100 or even 10 byte writes. It makes very little sense since we are not micro-benchmarking syscalls or VFS layer here, while before the blocks reach the vdev layer absolute majority of the small writes will be aggregated. In some cases I see we spend almost as much time creating the test files as actually running the tests. And sometimes the tests even time out after that. Reviewed-by: Tony Hutter Reviewed-by: George Melikov Signed-off-by: Alexander Motin Sponsored by: iXsystems, Inc. Closes #16905 --- .../tests/functional/raidz/raidz_expand_001_pos.ksh | 6 +++--- .../tests/functional/raidz/raidz_expand_002_pos.ksh | 6 +++--- .../tests/functional/raidz/raidz_expand_003_neg.ksh | 2 +- .../tests/functional/raidz/raidz_expand_003_pos.ksh | 4 ++-- .../tests/functional/raidz/raidz_expand_004_pos.ksh | 4 ++-- .../tests/functional/raidz/raidz_expand_005_pos.ksh | 4 ++-- .../tests/functional/redundancy/redundancy_draid.ksh | 6 +++--- .../functional/redundancy/redundancy_draid_damaged1.ksh | 6 +++--- .../functional/redundancy/redundancy_draid_damaged2.ksh | 6 +++--- .../tests/functional/redundancy/redundancy_raidz.ksh | 6 +++--- 10 files changed, 25 insertions(+), 25 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 index d4923fdb67d9..125b0e5411a3 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh @@ -200,13 +200,13 @@ log_must zpool create -f -o cachefile=none $TESTPOOL $raid ${disks[@]} log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs -log_must fill_fs /$TESTPOOL/fs 1 512 100 1024 R +log_must fill_fs /$TESTPOOL/fs 1 512 102400 1 R log_must zfs create -o compress=on $TESTPOOL/fs2 -log_must fill_fs /$TESTPOOL/fs2 1 512 100 1024 R +log_must fill_fs /$TESTPOOL/fs2 1 512 102400 1 R log_must zfs create -o compress=on -o recordsize=8k $TESTPOOL/fs3 -log_must fill_fs /$TESTPOOL/fs3 1 512 100 1024 R +log_must fill_fs /$TESTPOOL/fs3 1 512 102400 1 R log_must check_pool_status $TESTPOOL "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 index 56810aca099f..185316a7cb85 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh @@ -78,13 +78,13 @@ log_must zpool create -f $opts $pool $raid ${disks[1..$(($nparity+1))]} log_must zfs set primarycache=metadata $pool log_must zfs create $pool/fs -log_must fill_fs /$pool/fs 1 512 100 1024 R +log_must fill_fs /$pool/fs 1 512 102400 1 R log_must zfs create -o compress=on $pool/fs2 -log_must fill_fs /$pool/fs2 1 512 100 1024 R +log_must fill_fs /$pool/fs2 1 512 102400 1 R log_must zfs create -o compress=on -o recordsize=8k $pool/fs3 -log_must fill_fs /$pool/fs3 1 512 100 1024 R +log_must fill_fs /$pool/fs3 1 512 102400 1 R typeset pool_size=$(get_pool_prop size $pool) diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh index 4d85c46897b8..a2eb87b1f722 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh @@ -92,7 +92,7 @@ log_must zpool destroy $pool log_must zpool create -f $opts $pool $raid ${disks[1..$(($devs-1))]} log_must zfs set primarycache=metadata $pool log_must zfs create $pool/fs -log_must fill_fs /$pool/fs 1 512 100 1024 R +log_must fill_fs /$pool/fs 1 512 102400 1 R allocated=$(zpool list -Hp -o allocated $pool) log_must set_tunable64 RAIDZ_EXPAND_MAX_REFLOW_BYTES $((allocated / 4)) log_must zpool attach $pool ${raid}-0 ${disks[$devs]} diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh index 712b25261773..6f852c516ca4 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh @@ -94,10 +94,10 @@ opts="-o cachefile=none" log_must zpool create -f $opts $pool $raid ${disks[1..$(($nparity+1))]} log_must zfs create -o recordsize=8k $pool/fs -log_must fill_fs /$pool/fs 1 256 100 1024 R +log_must fill_fs /$pool/fs 1 256 102400 1 R log_must zfs create -o recordsize=128k $pool/fs2 -log_must fill_fs /$pool/fs2 1 256 100 1024 R +log_must fill_fs /$pool/fs2 1 256 102400 1 R for disk in ${disks[$(($nparity+2))..$devs]}; do log_must mkfile -n 400m /$pool/fs/file diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh index 2be55dae4254..5056e4e4b1fd 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh @@ -81,10 +81,10 @@ log_must set_tunable32 SCRUB_AFTER_EXPAND 0 log_must zpool create -f $opts $pool $raid ${disks[1..$(($nparity+1))]} log_must zfs create -o recordsize=8k $pool/fs -log_must fill_fs /$pool/fs 1 128 100 1024 R +log_must fill_fs /$pool/fs 1 128 102400 1 R log_must zfs create -o recordsize=128k $pool/fs2 -log_must fill_fs /$pool/fs2 1 128 100 1024 R +log_must fill_fs /$pool/fs2 1 128 102400 1 R for disk in ${disks[$(($nparity+2))..$devs]}; do log_must zpool attach $pool ${raid}-0 $disk diff --git a/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh b/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh index 56ee3e9be67c..49b9f6c1d353 100755 --- a/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh +++ b/tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh @@ -137,10 +137,10 @@ log_must zpool create -f $opts $pool $raid ${disks[1..$(($nparity+1))]} devices="${disks[1..$(($nparity+1))]}" log_must zfs create -o recordsize=8k $pool/fs -log_must fill_fs /$pool/fs 1 128 100 1024 R +log_must fill_fs /$pool/fs 1 128 102400 1 R log_must zfs create -o recordsize=128k $pool/fs2 -log_must fill_fs /$pool/fs2 1 128 100 1024 R +log_must fill_fs /$pool/fs2 1 128 102400 1 R for disk in ${disks[$(($nparity+2))..$devs]}; do # Set pause to some random value near halfway point diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh index 8208d2b4a398..df113a98aa3c 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh @@ -223,13 +223,13 @@ for nparity in 1 2 3; do log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs - log_must fill_fs /$TESTPOOL/fs 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs 1 512 102400 1 R log_must zfs create -o compress=on $TESTPOOL/fs2 - log_must fill_fs /$TESTPOOL/fs2 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs2 1 512 102400 1 R log_must zfs create -o compress=on -o recordsize=8k $TESTPOOL/fs3 - log_must fill_fs /$TESTPOOL/fs3 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs3 1 512 102400 1 R typeset pool_size=$(get_pool_prop size $TESTPOOL) diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged1.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged1.ksh index 110c69159eb1..50d7358411dc 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged1.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged1.ksh @@ -119,13 +119,13 @@ for nparity in 1 2 3; do log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs - log_must fill_fs /$TESTPOOL/fs 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs 1 512 102400 1 R log_must zfs create -o compress=on $TESTPOOL/fs2 - log_must fill_fs /$TESTPOOL/fs2 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs2 1 512 102400 1 R log_must zfs create -o compress=on -o recordsize=8k $TESTPOOL/fs3 - log_must fill_fs /$TESTPOOL/fs3 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs3 1 512 102400 1 R log_must zpool export $TESTPOOL log_must zpool import -o cachefile=none -d $dir $TESTPOOL diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh index b0bb4ef84129..ad66f8633986 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh @@ -94,13 +94,13 @@ for nparity in 1 2 3; do # log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs - log_must fill_fs /$TESTPOOL/fs 1 256 10 1024 R + log_must fill_fs /$TESTPOOL/fs 1 256 10240 1 R log_must zfs create -o compress=on $TESTPOOL/fs2 - log_must fill_fs /$TESTPOOL/fs2 1 256 10 1024 R + log_must fill_fs /$TESTPOOL/fs2 1 256 10240 1 R log_must zfs create -o compress=on -o recordsize=8k $TESTPOOL/fs3 - log_must fill_fs /$TESTPOOL/fs3 1 256 10 1024 R + log_must fill_fs /$TESTPOOL/fs3 1 256 10240 1 R log_must zpool export $TESTPOOL log_must zpool import -o cachefile=none -d $dir $TESTPOOL diff --git a/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh b/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh index 83cacda84b09..7de35c947fec 100755 --- a/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh +++ b/tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh @@ -223,13 +223,13 @@ for nparity in 1 2 3; do log_must zfs set primarycache=metadata $TESTPOOL log_must zfs create $TESTPOOL/fs - log_must fill_fs /$TESTPOOL/fs 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs 1 512 102400 1 R log_must zfs create -o compress=on $TESTPOOL/fs2 - log_must fill_fs /$TESTPOOL/fs2 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs2 1 512 102400 1 R log_must zfs create -o compress=on -o recordsize=8k $TESTPOOL/fs3 - log_must fill_fs /$TESTPOOL/fs3 1 512 100 1024 R + log_must fill_fs /$TESTPOOL/fs3 1 512 102400 1 R typeset pool_size=$(get_pool_prop size $TESTPOOL)