mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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
committed by
Dave Chinner
Dave Chinner
parent
e020a49a70
commit
d0a3cc5af8
+4
-4
@@ -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
|
||||
|
||||
+23
-23
@@ -15,8 +15,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
*** mount
|
||||
*** using some initial space on scratch filesystem
|
||||
*** stressing a 125829120 byte filesystem
|
||||
*** growing to a 169869312 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -25,8 +25,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=4
|
||||
|
||||
*** stressing a 169869312 byte filesystem
|
||||
*** growing to a 213909504 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -35,8 +35,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=6
|
||||
|
||||
*** stressing a 213909504 byte filesystem
|
||||
*** growing to a 257949696 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -45,8 +45,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=7
|
||||
|
||||
*** stressing a 257949696 byte filesystem
|
||||
*** growing to a 301989888 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -55,8 +55,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=9
|
||||
|
||||
*** stressing a 301989888 byte filesystem
|
||||
*** growing to a 346030080 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -65,8 +65,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=10
|
||||
|
||||
*** stressing a 346030080 byte filesystem
|
||||
*** growing to a 390070272 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -75,8 +75,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=11
|
||||
|
||||
*** stressing a 390070272 byte filesystem
|
||||
*** growing to a 434110464 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -85,8 +85,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=13
|
||||
|
||||
*** stressing a 434110464 byte filesystem
|
||||
*** growing to a 478150656 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -95,18 +95,18 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=14
|
||||
|
||||
*** stressing a 478150656 byte filesystem
|
||||
*** growing to a 522190848 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
naming =VERN bsize=XXX
|
||||
log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=16
|
||||
AGCOUNT=15
|
||||
|
||||
*** stressing a 522190848 byte filesystem
|
||||
*** growing to a 566231040 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
@@ -115,8 +115,8 @@ log =LDEV bsize=XXX blocks=XXX
|
||||
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
|
||||
AGCOUNT=17
|
||||
|
||||
*** stressing a 566231040 byte filesystem
|
||||
*** growing to a 610271232 byte filesystem
|
||||
*** stressing filesystem
|
||||
*** growing filesystem
|
||||
meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
|
||||
data = bsize=XXX blocks=XXX, imaxpct=PCT
|
||||
= sunit=XXX swidth=XXX, unwritten=X
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ _require_scratch
|
||||
# this may hang
|
||||
sync
|
||||
|
||||
export MKFS_OPTIONS="-l version=2,size=1200b,su=64k"
|
||||
export MKFS_OPTIONS="-l version=2,size=2560b,su=64k"
|
||||
export MOUNT_OPTIONS="-o logbsize=64k"
|
||||
_scratch_mkfs_xfs >/dev/null
|
||||
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ _supported_os IRIX Linux
|
||||
# real QA test starts here
|
||||
rm -f $seqres.full
|
||||
_require_scratch
|
||||
_scratch_mkfs_xfs -n size=16k -l size=5m -d size=128m >> $seqres.full 2>&1
|
||||
_scratch_mkfs_xfs -n size=16k -l size=10m -d size=133m >> $seqres.full 2>&1
|
||||
_scratch_mount
|
||||
|
||||
# First we cause very badly fragmented freespace, then
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ _require_scratch
|
||||
_require_freeze
|
||||
|
||||
rm -f $seqres.full
|
||||
_scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=2560b >/dev/null 2>&1
|
||||
_scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=5120b >/dev/null 2>&1
|
||||
_scratch_mount >/dev/null 2>&1
|
||||
|
||||
STRESS_DIR="$SCRATCH_MNT/testdir"
|
||||
|
||||
Reference in New Issue
Block a user