From 2066988abf20bab854f9385c1df17ea73a0f6df3 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Thu, 2 Jun 2022 10:31:23 +1000 Subject: [PATCH] xfs/538: fix fsstress scaling _scale_fsstress_args() does time/load scaling of parameters. Doing it also in the test causes exponential scaling instead of linear scaling as the time/load parameters are meant to do. Signed-off-by: Dave Chinner Reviewed-by: Darrick J. Wong Signed-off-by: Zorro Lang --- tests/xfs/538 | 36 +++++++++++++++++------------------- tests/xfs/538.out | 3 +-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/tests/xfs/538 b/tests/xfs/538 index e0102f485..2b5e97e58 100755 --- a/tests/xfs/538 +++ b/tests/xfs/538 @@ -47,25 +47,23 @@ done echo "Inject bmap_alloc_minlen_extent error tag" _scratch_inject_error bmap_alloc_minlen_extent 1 -echo "Scale fsstress args" -args=$(_scale_fsstress_args -p $((LOAD_FACTOR * 75)) -n $((TIME_FACTOR * 1000))) - -echo "Execute fsstress in background" -$FSSTRESS_PROG -d $SCRATCH_MNT $args \ - -f bulkstat=0 \ - -f bulkstat1=0 \ - -f fiemap=0 \ - -f getattr=0 \ - -f getdents=0 \ - -f getfattr=0 \ - -f listfattr=0 \ - -f mread=0 \ - -f read=0 \ - -f readlink=0 \ - -f readv=0 \ - -f stat=0 \ - -f aread=0 \ - -f dread=0 > /dev/null 2>&1 +echo "Execute fsstress" +$FSSTRESS_PROG -d $SCRATCH_MNT \ + $(_scale_fsstress_args -p 75 -n 1000) \ + -f bulkstat=0 \ + -f bulkstat1=0 \ + -f fiemap=0 \ + -f getattr=0 \ + -f getdents=0 \ + -f getfattr=0 \ + -f listfattr=0 \ + -f mread=0 \ + -f read=0 \ + -f readlink=0 \ + -f readv=0 \ + -f stat=0 \ + -f aread=0 \ + -f dread=0 > /dev/null 2>&1 # success, all done status=0 diff --git a/tests/xfs/538.out b/tests/xfs/538.out index 85932c826..97ebc314e 100644 --- a/tests/xfs/538.out +++ b/tests/xfs/538.out @@ -3,5 +3,4 @@ Format and mount fs Consume free space Create fragmented filesystem Inject bmap_alloc_minlen_extent error tag -Scale fsstress args -Execute fsstress in background +Execute fsstress -- 2.49.0