xfs/104: log size too small for 4k sector drives

xfs/104, xfs/119, xfs/291 and xfs/297 have small fixed log sizes. A
recent change to the kernel ramdisk changed it's physical sector
size from 512B to 4kB, and this results in mkfs calculating a log
size larger than the fixed test size and hence the tests fail.

Change the log size to a larger size that works with 4k sectors, and
also increase the size of the filesystem being created so that the
amount of data space in the filesystem does not change and hence
does not perturb the rest of the test.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner
2015-03-18 14:54:08 +11:00
committed by Dave Chinner
parent e020a49a70
commit d0a3cc5af8
5 changed files with 30 additions and 30 deletions
+4 -4
View File
@@ -81,10 +81,10 @@ modsize=`expr 4 \* $incsize` # pause after this many increments
[ `expr $endsize / $dbsize` -lt $dblocks ] || _notrun "Scratch device too small"
nags=4
size=`expr 120 \* 1048576` # 120 megabytes initially
size=`expr 125 \* 1048576` # 120 megabytes initially
sizeb=`expr $size / $dbsize` # in data blocks
echo "*** creating scratch filesystem"
_create_scratch -lsize=5m -dsize=${size} -dagcount=${nags}
_create_scratch -lsize=10m -dsize=${size} -dagcount=${nags}
fillsize=`expr 110 \* 1048576` # 110 megabytes of filling
echo "*** using some initial space on scratch filesystem"
@@ -95,13 +95,13 @@ _fill_scratch $fillsize
# Kick off more stress threads on each iteration, grow; repeat.
#
while [ $size -le $endsize ]; do
echo "*** stressing a ${size} byte filesystem"
echo "*** stressing filesystem"
echo "*** stressing a ${sizeb} block filesystem" >> $seqres.full
_stress_scratch
sleep 1
size=`expr $size + $incsize`
sizeb=`expr $size / $dbsize` # in data blocks
echo "*** growing to a ${size} byte filesystem"
echo "*** growing filesystem"
echo "*** growing to a ${sizeb} block filesystem" >> $seqres.full
xfs_growfs -D ${sizeb} $SCRATCH_MNT \
| tee -a $seqres.full | _filter_mkfs 2>$tmp.growfs