apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

filter: inode size output of mkfs.xfs can change

Browse Source 
With the change to CRCs by default, the mkfs inode size is defaults
to 512 bytes and the minimum block size changes to 1024 bytes. This
causes mismatches with golden output that expects the inode size to
be 256 bytes, and some tests are tailored around the amount of space
inside a 256 byte inode. Fix them with appropriate filtering or mkfs
parameters to allow 256 byte inodes to be used.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner
2015-05-14 12:20:11 +10:00
committed by Dave Chinner
parent da8f501cb3
commit c5223b9294
13 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/073
+2 -2
View File
@@ -136,7 +136,7 @@ _require_loop
rm -f $seqres.full rm -f $seqres.full
_scratch_mkfs_xfs -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null _scratch_mkfs_xfs -m crc=0 -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null
_scratch_mount 2>/dev/null || _fail "initial scratch mount failed" _scratch_mount 2>/dev/null || _fail "initial scratch mount failed"
echo echo
@@ -156,7 +156,7 @@ _verify_copy $imgs.image $SCRATCH_DEV $SCRATCH_MNT
echo echo
echo === copying scratch device to single target, large ro device echo === copying scratch device to single target, large ro device
${MKFS_XFS_PROG} -dfile,name=$imgs.source,size=100g | _filter_mkfs 2>/dev/null ${MKFS_XFS_PROG} -m crc=0 -dfile,name=$imgs.source,size=100g | _filter_mkfs 2>/dev/null
rmdir $imgs.source_dir 2>/dev/null rmdir $imgs.source_dir 2>/dev/null
mkdir $imgs.source_dir mkdir $imgs.source_dir
tests/xfs/096
+3 -3
View File
@@ -77,7 +77,7 @@ mkfs_filter()
-e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \ -e 's/swidth=[0-9][0-9]* blks$/&, unwritten=1/' \
-e 's/rtextents=[0-9][0-9]*/rtextents=N/' \ -e 's/rtextents=[0-9][0-9]*/rtextents=N/' \
-e 's/meta-data=[^ ]*/meta-data=DEV/' \ -e 's/meta-data=[^ ]*/meta-data=DEV/' \
-e 's/ *isize/ isize/' \ -e 's/ *isize=[0-9]* / isize=N /' \
-e '/ *= *sectsz=[0-9][0-9]* *attr=[0-9][0-9]*.*$/d' \ -e '/ *= *sectsz=[0-9][0-9]* *attr=[0-9][0-9]*.*$/d' \
-e '/ *= *mmr=[0-9][0-9]* *$/d' \ -e '/ *= *mmr=[0-9][0-9]* *$/d' \
-e 's/ *mixed-case=[YN]//' \ -e 's/ *mixed-case=[YN]//' \
@@ -130,9 +130,9 @@ cat >$tmp.seq.params <<EOF
# same test but get log stripe from data stripe # same test but get log stripe from data stripe
-l version=2 -d su=$big_su,sw=1 -l version=2 -d su=$big_su,sw=1
# test out data stripe # test out data stripe
-l version=1 -d su=$big_su,sw=1 -m crc=0 -l version=1 -d su=$big_su,sw=1
# test out data stripe the same but using sunit & swidth # test out data stripe the same but using sunit & swidth
-l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512` -m crc=0 -l version=1 -d sunit=`expr $big_su / 512`,swidth=`expr $big_su / 512`
EOF EOF
# #
tests/xfs/096.external
+6 -6
View File
@@ -7,7 +7,7 @@ log stripe unit (262656) must be a multiple of the block size (4096)
# test log stripe greater than LR size # test log stripe greater than LR size
--- mkfs=-l version=2,su=266240 --- --- mkfs=-l version=2,su=266240 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=0 swidth=0 blks, unwritten=1 = sunit=0 swidth=0 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -17,7 +17,7 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# same test but get log stripe from data stripe # same test but get log stripe from data stripe
--- mkfs=-l version=2 -d su=266240,sw=1 --- --- mkfs=-l version=2 -d su=266240,sw=1 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -27,8 +27,8 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# test out data stripe # test out data stripe
--- mkfs=-l version=1 -d su=266240,sw=1 --- --- mkfs=-m crc=0 -l version=1 -d su=266240,sw=1 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -38,8 +38,8 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# test out data stripe the same but using sunit & swidth # test out data stripe the same but using sunit & swidth
--- mkfs=-l version=1 -d sunit=520,swidth=520 --- --- mkfs=-m crc=0 -l version=1 -d sunit=520,swidth=520 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
tests/xfs/096.internal
+6 -6
View File
@@ -7,7 +7,7 @@ log stripe unit (262656) must be a multiple of the block size (4096)
# test log stripe greater than LR size # test log stripe greater than LR size
--- mkfs=-l version=2,su=266240 --- --- mkfs=-l version=2,su=266240 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=0 swidth=0 blks, unwritten=1 = sunit=0 swidth=0 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -18,7 +18,7 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# same test but get log stripe from data stripe # same test but get log stripe from data stripe
--- mkfs=-l version=2 -d su=266240,sw=1 --- --- mkfs=-l version=2 -d su=266240,sw=1 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -28,8 +28,8 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# test out data stripe # test out data stripe
--- mkfs=-l version=1 -d su=266240,sw=1 --- --- mkfs=-m crc=0 -l version=1 -d su=266240,sw=1 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
@@ -39,8 +39,8 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N
# test out data stripe the same but using sunit & swidth # test out data stripe the same but using sunit & swidth
--- mkfs=-l version=1 -d sunit=520,swidth=520 --- --- mkfs=-m crc=0 -l version=1 -d sunit=520,swidth=520 ---
meta-data=DEV isize=256 agcount=N, agsize=N blks meta-data=DEV isize=N agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
tests/xfs/187
+2 -2
View File
@@ -70,8 +70,8 @@ export MOUNT_OPTIONS=""
# lazysb, attr2 and other feature bits are held in features2 and will require # lazysb, attr2 and other feature bits are held in features2 and will require
# morebitsbit on So test with lazysb and without it to see if the morebitsbit is # morebitsbit on So test with lazysb and without it to see if the morebitsbit is
# okay etc. If the mkfs defaults change, these need to change as well. # okay etc. If the mkfs defaults change, these need to change as well.
export MKFS_NO_LAZY="-l lazy-count=0 -i projid32bit=0" export MKFS_NO_LAZY="-m crc=0 -l lazy-count=0 -i projid32bit=0"
export MKFS_LAZY="-l lazy-count=1 -i projid32bit=0" export MKFS_LAZY="-m crc=0 -l lazy-count=1 -i projid32bit=0"
# Make sure that when we think we are testing with morebits off # Make sure that when we think we are testing with morebits off
# that we really are. # that we really are.
tests/xfs/194
+3 -1
View File
@@ -83,7 +83,9 @@ _filter_od()
_require_scratch _require_scratch
unset MKFS_OPTIONS unset MKFS_OPTIONS
unset XFS_MKFS_OPTIONS unset XFS_MKFS_OPTIONS
_scratch_mkfs_xfs -b size=$blksize >/dev/null 2>&1
# we need 512 byte block size, so crc's are turned off
_scratch_mkfs_xfs -m crc=0 -b size=$blksize >/dev/null 2>&1
_scratch_mount _scratch_mount
# 512b block / 4k page example: # 512b block / 4k page example:
tests/xfs/199
+1 -1
View File
@@ -52,7 +52,7 @@ _require_scratch
# clear any mkfs options so taht we can directly specify the options we need to # clear any mkfs options so taht we can directly specify the options we need to
# be able to test the features bitmask behaviour correctly. # be able to test the features bitmask behaviour correctly.
MKFS_OPTIONS= MKFS_OPTIONS=
_scratch_mkfs_xfs -l lazy-count=1 -i projid32bit=0 >/dev/null 2>&1 _scratch_mkfs_xfs -m crc=0 -l lazy-count=1 -i projid32bit=0 >/dev/null 2>&1
# #
# Print the current flags. Just a dummy so that the test breaks # Print the current flags. Just a dummy so that the test breaks
tests/xfs/206
+6 -4
View File
@@ -75,19 +75,21 @@ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \
mkfs_filter() mkfs_filter()
{ {
sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \ sed -e 's/meta-data=[^ ]*/meta-data=FILE/' \
-e 's/ *isize=[0-9]* / isize=N /' \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \ -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \ -e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \ -e "s/ ftype=[0-9]//" \
-e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \ -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \
-e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
-e "s/, lazy-count=[0-9]//" \
-e "/.*crc=/d" -e "/.*crc=/d"
} }
# mkfs slightly smaller than that # mkfs slightly smaller than that, small log for speed.
echo "=== mkfs.xfs ===" echo "=== mkfs.xfs ==="
mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b \ mkfs.xfs -f -bsize=4096 -l size=32m -dagsize=76288719b,size=3905982455b \
-llazy-count=0 $tmpfile | mkfs_filter $tmpfile | mkfs_filter
mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount" mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
tests/xfs/206.out
+6 -6
View File
@@ -1,30 +1,30 @@
QA output created by 206 QA output created by 206
=== truncate file === === truncate file ===
=== mkfs.xfs === === mkfs.xfs ===
meta-data=FILE isize=256 agcount=52, agsize=76288719 blks meta-data=FILE isize=N agcount=52, agsize=76288719 blks
= sectsz=512 attr=2 = sectsz=512 attr=2
data = bsize=4096 blocks=3905982455, imaxpct=5 data = bsize=4096 blocks=3905982455, imaxpct=5
= sunit=0 swidth=0 blks = sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0 naming =version 2 bsize=4096 ascii-ci=0
log =internal log bsize=4096 blocks=XXXXX, version=2 log =internal log bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0 = sectsz=512 sunit=0 blks
realtime =none extsz=4096 blocks=0, rtextents=0 realtime =none extsz=4096 blocks=0, rtextents=0
=== xfs_growfs === === xfs_growfs ===
meta-data=FILE isize=256 agcount=52, agsize=76288719 blks meta-data=FILE isize=N agcount=52, agsize=76288719 blks
= sectsz=512 attr=2 = sectsz=512 attr=2
data = bsize=4096 blocks=3905982455, imaxpct=5 data = bsize=4096 blocks=3905982455, imaxpct=5
= sunit=0 swidth=0 blks = sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0 naming =version 2 bsize=4096 ascii-ci=0
log =internal bsize=4096 blocks=XXXXX, version=2 log =internal bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0 = sectsz=512 sunit=0 blks
realtime =none extsz=4096 blocks=0, rtextents=0 realtime =none extsz=4096 blocks=0, rtextents=0
data blocks changed from 3905982455 to 4882478016 data blocks changed from 3905982455 to 4882478016
=== xfs_info === === xfs_info ===
meta-data=FILE isize=256 agcount=64, agsize=76288719 blks meta-data=FILE isize=N agcount=64, agsize=76288719 blks
= sectsz=512 attr=2 = sectsz=512 attr=2
data = bsize=4096 blocks=4882478016, imaxpct=5 data = bsize=4096 blocks=4882478016, imaxpct=5
= sunit=0 swidth=0 blks = sunit=0 swidth=0 blks
naming =version 2 bsize=4096 ascii-ci=0 naming =version 2 bsize=4096 ascii-ci=0
log =internal bsize=4096 blocks=XXXXX, version=2 log =internal bsize=4096 blocks=XXXXX, version=2
= sectsz=512 sunit=0 blks, lazy-count=0 = sectsz=512 sunit=0 blks
realtime =none extsz=4096 blocks=0, rtextents=0 realtime =none extsz=4096 blocks=0, rtextents=0
tests/xfs/259
+18 -3
View File
@@ -37,6 +37,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks # get standard environment, filters and checks
. ./common/rc . ./common/rc
. ./common/filter
# real QA test starts here # real QA test starts here
_supported_fs xfs _supported_fs xfs
@@ -47,9 +48,22 @@ _require_math
testfile=$TEST_DIR/259.image testfile=$TEST_DIR/259.image
# Test various sizes slightly less than 4 TB # Test various sizes slightly less than 4 TB. Need to handle different
# minimum block sizes for CRC enabled filesystems, but use a small log so we
# don't write lots of zeros unnecessarily.
xfs_info $TEST_DIR | _filter_mkfs 2> $tmp.mkfs > /dev/null
. $tmp.mkfs
if [ $_fs_has_crcs -eq 1 ]; then
blocksize=1024
sizes_to_check="1024 2048 4096"
echo "Trying to make (4 TB - 512) B long xfs fs image"
else
blocksize=512
sizes_to_check="512 1024 2048 4096"
fi
four_TB=$(_math "2^42") four_TB=$(_math "2^42")
for del in 512 1024 2048 4096; do for del in $sizes_to_check; do
ddseek=$(_math "$four_TB - $del") ddseek=$(_math "$four_TB - $del")
echo "Trying to make (4 TB - $del) B long xfs fs image" echo "Trying to make (4 TB - $del) B long xfs fs image"
rm -f "$testfile" rm -f "$testfile"
@@ -57,7 +71,8 @@ for del in 512 1024 2048 4096; do
>/dev/null 2>&1 || echo "dd failed" >/dev/null 2>&1 || echo "dd failed"
lofile=$(losetup -f) lofile=$(losetup -f)
losetup $lofile "$testfile" losetup $lofile "$testfile"
"$MKFS_XFS_PROG" -b size=512 $lofile >/dev/null || echo "mkfs failed!" "$MKFS_XFS_PROG" -l size=32m -b size=$blocksize $lofile \
>/dev/null || echo "mkfs failed!"
sync sync
losetup -d $lofile losetup -d $lofile
done done
tests/xfs/292
+2 -2
View File
@@ -55,12 +55,12 @@ $XFS_IO_PROG -f -c "truncate 256g" $fsfile
echo "mkfs.xfs without geometry" echo "mkfs.xfs without geometry"
mkfs.xfs -f $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null mkfs.xfs -f $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null
grep -E 'ddev|isize|agcount|agsize' $tmp.mkfs | \ grep -E 'ddev|agcount|agsize' $tmp.mkfs | \
sed -e "s:$fsfile:FILENAME:g" sed -e "s:$fsfile:FILENAME:g"
echo "mkfs.xfs with cmdline geometry" echo "mkfs.xfs with cmdline geometry"
mkfs.xfs -f -d su=16k,sw=5 $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null mkfs.xfs -f -d su=16k,sw=5 $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null
grep -E 'ddev|isize|agcount|agsize' $tmp.mkfs | \ grep -E 'ddev|agcount|agsize' $tmp.mkfs | \
sed -e "s:$fsfile:FILENAME:g" sed -e "s:$fsfile:FILENAME:g"
rm -f $fsfile rm -f $fsfile
tests/xfs/292.out
-2
View File
@@ -1,11 +1,9 @@
QA output created by 292 QA output created by 292
mkfs.xfs without geometry mkfs.xfs without geometry
ddev=FILENAME ddev=FILENAME
isize=256
agcount=4 agcount=4
agsize=16777216 agsize=16777216
mkfs.xfs with cmdline geometry mkfs.xfs with cmdline geometry
ddev=FILENAME ddev=FILENAME
isize=256
agcount=16 agcount=16
agsize=4194304 agsize=4194304
tests/xfs/300
+2 -1
View File
@@ -51,7 +51,8 @@ getenforce | grep -q "Enforcing\|Permissive" || _notrun "SELinux not enabled"
rm -f $seqres.full rm -f $seqres.full
_scratch_mkfs_xfs -i size=256 >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mkfs_xfs -m crc=0 -i size=256 >> $seqres.full 2>&1 \
|| _fail "mkfs failed"
# Manually mount to avoid fs-wide context set by default in xfstests # Manually mount to avoid fs-wide context set by default in xfstests
mount $SCRATCH_DEV $SCRATCH_MNT mount $SCRATCH_DEV $SCRATCH_MNT