Skip to content

Commit

Permalink
ZTS: Increase write sizes for RAIDZ/dRAID tests
Browse files Browse the repository at this point in the history 
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 <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by:	Alexander Motin <[email protected]>
Sponsored by:	iXsystems, Inc.
Closes openzfs#16905
  • Loading branch information
@amotin
amotin authored Dec 27, 2024
1 parent c37a2dd commit 89f796d
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/raidz/raidz_expand_001_pos.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/raidz/raidz_expand_002_pos.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/raidz/raidz_expand_003_neg.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]}
Expand Down
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/raidz/raidz_expand_003_pos.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/raidz/raidz_expand_004_pos.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/raidz/raidz_expand_005_pos.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/redundancy/redundancy_draid.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged1.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/redundancy/redundancy_draid_damaged2.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tests/zfs-tests/tests/functional/redundancy/redundancy_raidz.ksh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 89f796d

Please sign in to comment.