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: xfs_io output has dropped "64" from error messages

Browse Source 
Upstream xfs_io has been converted to always use LFS compliant
(i.e. 64 bit) pwrite() rather than pwrite64(). Similar changes have
been made for multiple syscalls that have "*64" variants. hence the
error output of all these commands has changed, such as "pwrite64:
..." to "pwrite: ....".

Make a filter to catch the *64 variants and strip it, and
convert all the golden output to use the non-*64 variant. This will
make all golden output matching work correctly regardless of what
version of xfs_io is in use.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Dave Chinner
2016-11-03 08:15:25 +11:00
committed by Eryu Guan
parent efef020df5
commit c52086226b
29 changed files with 81 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+7
View File
@@ -226,6 +226,13 @@ _filter_xfs_io()
sed -e "s/[0-9/.]* [GMKiBbytes]*, [0-9]* ops\; [0-9/:. sec]* ([infa0-9/.]* [EPGMKiBbytes]*\/sec and [infa0-9/.]* ops\/sec)/XXX Bytes, X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/" sed -e "s/[0-9/.]* [GMKiBbytes]*, [0-9]* ops\; [0-9/:. sec]* ([infa0-9/.]* [EPGMKiBbytes]*\/sec and [infa0-9/.]* ops\/sec)/XXX Bytes, X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/"
} }
# stderr filter for xfs_io to handle change of error output format (e.g.
# pwrite64 -> pwrite).
_filter_xfs_io_error()
{
sed -e "s/^\(.*\)64\(: .*$\)/\1\2/"
}
_filter_xfs_io_unique() _filter_xfs_io_unique()
{ {
common_line_filter | _filter_xfs_io common_line_filter | _filter_xfs_io
tests/btrfs/126
+2 -2
View File
@@ -62,8 +62,8 @@ _run_btrfs_util_prog qgroup limit 512K 0/5 $SCRATCH_MNT
# so redirect stdout to seqres.full. # so redirect stdout to seqres.full.
# Also, EDQUOTA is expected, which can't be redirected due to the limitation # Also, EDQUOTA is expected, which can't be redirected due to the limitation
# of _filter_xfs_io, so golden output will include EDQUOTA error message # of _filter_xfs_io, so golden output will include EDQUOTA error message
_pwrite_byte 0xcdcdcdcd 0 1M $SCRATCH_MNT/test_file | _filter_xfs_io \ _pwrite_byte 0xcdcdcdcd 0 1M $SCRATCH_MNT/test_file 2>&1 >> $seqres.full | \
>> $seqres.full _filter_xfs_io_error
# Fstests will umount the fs, and at umount time, kernel warning will be # Fstests will umount the fs, and at umount time, kernel warning will be
# triggered # triggered
tests/btrfs/126.out
+1 -1
View File
@@ -1,2 +1,2 @@
QA output created by 126 QA output created by 126
pwrite64: Disk quota exceeded pwrite: Disk quota exceeded
tests/ext4/306
+2 -1
View File
@@ -57,7 +57,8 @@ $XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 0 1m" | _filter_xfs_io
# Create a large non-extent-based file filling the fs; this will run out & fail # Create a large non-extent-based file filling the fs; this will run out & fail
echo "Create testfile2 to fill the fs" echo "Create testfile2 to fill the fs"
$XFS_IO_PROG -f $SCRATCH_MNT/testfile2 -c "pwrite 0 512m" | _filter_xfs_io $XFS_IO_PROG -f $SCRATCH_MNT/testfile2 -c "pwrite 0 512m" 2>&1 | \
_filter_xfs_io_error
df -h $SCRATCH_MNT >> $seqres.full df -h $SCRATCH_MNT >> $seqres.full
# Grow fs by 512m # Grow fs by 512m
tests/ext4/306.out
+1 -1
View File
@@ -3,7 +3,7 @@ Create 1m testfile1
wrote 1048576/1048576 bytes at offset 0 wrote 1048576/1048576 bytes at offset 0
XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Create testfile2 to fill the fs Create testfile2 to fill the fs
pwrite64: No space left on device pwrite: No space left on device
Resize to 1g Resize to 1g
append 2m to testfile1 append 2m to testfile1
wrote 2097152/2097152 bytes at offset 1048576 wrote 2097152/2097152 bytes at offset 1048576
tests/f2fs/001
+2 -4
View File
@@ -69,10 +69,8 @@ $XFS_IO_PROG -t -f -c "falloc 0 5g" $dummyfile | _filter_xfs_io
# -ENOSPC should be triggered without any panic # -ENOSPC should be triggered without any panic
echo "==== change i_size & write data ====" echo "==== change i_size & write data ===="
$XFS_IO_PROG \ $XFS_IO_PROG -c "truncate 96" -c "pwrite -S 0x58 8192 4096" $testfile 2>&1 \
-c "truncate 96" \ | _filter_xfs_io_error
-c "pwrite -S 0x58 8192 4096" \
$testfile | _filter_xfs_io
echo "==== check data contents ====" echo "==== check data contents ===="
hexdump -C $testfile hexdump -C $testfile
tests/f2fs/001.out
+1 -1
View File
@@ -5,7 +5,7 @@ XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
==== Fullfill the partition ==== ==== Fullfill the partition ====
fallocate: No space left on device fallocate: No space left on device
==== change i_size & write data ==== ==== change i_size & write data ====
pwrite64: No space left on device pwrite: No space left on device
==== check data contents ==== ==== check data contents ====
00000000 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 |XXXXXXXXXXXXXXXX| 00000000 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 |XXXXXXXXXXXXXXXX|
* *
tests/generic/171
+4 -2
View File
@@ -81,7 +81,8 @@ _pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2
sync sync
echo "CoW the big file" echo "CoW the big file"
out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile 2>&1)" out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
@@ -89,7 +90,8 @@ echo ${out}
echo "Remount and try CoW again" echo "Remount and try CoW again"
_scratch_cycle_mount _scratch_cycle_mount
out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile 2>&1)" out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
tests/generic/171.out
+2 -2
View File
@@ -4,6 +4,6 @@ Reformat with appropriate size
Create a big file and reflink it Create a big file and reflink it
Allocate the rest of the space Allocate the rest of the space
CoW the big file CoW the big file
pwrite64: No space left on device pwrite: No space left on device
Remount and try CoW again Remount and try CoW again
pwrite64: No space left on device pwrite: No space left on device
tests/generic/172
+4 -2
View File
@@ -77,7 +77,8 @@ _pwrite_byte 0x61 0 $fs_size $testdir/eat_my_space >> $seqres.full 2>&1
sync sync
echo "CoW the big file" echo "CoW the big file"
out="$(_pwrite_byte 0x62 0 $file_size $testdir/bigfile 2>&1)" out="$(_pwrite_byte 0x62 0 $file_size $testdir/bigfile 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
@@ -85,7 +86,8 @@ echo ${out}
echo "Remount and try CoW again" echo "Remount and try CoW again"
_scratch_cycle_mount _scratch_cycle_mount
out="$(_pwrite_byte 0x62 0 $file_size $testdir/bigfile 2>&1)" out="$(_pwrite_byte 0x62 0 $file_size $testdir/bigfile 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
tests/generic/172.out
+2 -2
View File
@@ -4,6 +4,6 @@ Reformat with appropriate size
Create a big file and reflink it Create a big file and reflink it
Allocate the rest of the space Allocate the rest of the space
CoW the big file CoW the big file
pwrite64: No space left on device pwrite: No space left on device
Remount and try CoW again Remount and try CoW again
pwrite64: No space left on device pwrite: No space left on device
tests/generic/174
+4 -2
View File
@@ -82,7 +82,8 @@ _pwrite_byte 0x61 0 $((blksz * nr_free)) $testdir/eat_my_space >> $seqres.full 2
sync sync
echo "CoW the big file" echo "CoW the big file"
out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile -d 2>&1)" out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile -d 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
@@ -90,7 +91,8 @@ echo ${out}
echo "Remount and try CoW again" echo "Remount and try CoW again"
_scratch_cycle_mount _scratch_cycle_mount
out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile -d 2>&1)" out="$(_pwrite_byte 0x62 0 $((blksz * nr_blks)) $testdir/bigfile -d 2>&1 | \
_filter_xfs_io_error)"
echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC" echo ${out} | grep -q "No space left on device" || echo "CoW should have failed with ENOSPC"
echo ${out} >> $seqres.full 2>&1 echo ${out} >> $seqres.full 2>&1
echo ${out} echo ${out}
tests/generic/174.out
+2 -2
View File
@@ -4,6 +4,6 @@ Reformat with appropriate size
Create a big file and reflink it Create a big file and reflink it
Allocate the rest of the space Allocate the rest of the space
CoW the big file CoW the big file
pwrite64: No space left on device pwrite: No space left on device
Remount and try CoW again Remount and try CoW again
pwrite64: No space left on device pwrite: No space left on device
tests/generic/230
+8 -4
View File
@@ -62,23 +62,27 @@ test_enforcement()
# Firstly fit below block soft limit # Firstly fit below block soft limit
echo "Write 900k..." echo "Write 900k..."
su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 900k' -c fsync \ su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 900k' -c fsync \
$SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | \
_filter_xfs_io_error | tee -a $seqres.full
repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Secondly overcome block soft limit # Secondly overcome block soft limit
echo "Rewrite 1001k..." echo "Rewrite 1001k..."
su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 1001k' -c fsync \ su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 1001k' -c fsync \
$SCRATCH_MNT/file1" 2>&1 >>$seqres.full | tee -a $seqres.full $SCRATCH_MNT/file1" 2>&1 >>$seqres.full | \
_filter_xfs_io_error | tee -a $seqres.full
repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Now try to overcome block hardlimit # Now try to overcome block hardlimit
echo "Write 1000k..." echo "Write 1000k..."
su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 1000k' -c fsync \ su $qa_user -c "$XFS_IO_PROG -c 'pwrite 0 1000k' -c fsync \
$SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | \
_filter_xfs_io_error | tee -a $seqres.full
repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# Now sleep for grace time and check that softlimit got enforced # Now sleep for grace time and check that softlimit got enforced
sleep $((grace+1)) sleep $((grace+1))
echo "Write 4096..." echo "Write 4096..."
su $qa_user -c "$XFS_IO_PROG -c 'truncate 0' -c 'pwrite 0 4096' \ su $qa_user -c "$XFS_IO_PROG -c 'truncate 0' -c 'pwrite 0 4096' \
$SCRATCH_MNT/file2" 2>&1 >>$seqres.full | tee -a $seqres.full $SCRATCH_MNT/file2" 2>&1 >>$seqres.full | \
_filter_xfs_io_error | tee -a $seqres.full
repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1 repquota -$type $SCRATCH_MNT | grep -v "^root" >>$seqres.full 2>&1
# And now the softlimit test for inodes # And now the softlimit test for inodes
# First reset space limits so that we don't have problems with # First reset space limits so that we don't have problems with
tests/generic/230.out
+4 -4
View File
@@ -7,9 +7,9 @@ QA output created by 230
Write 900k... Write 900k...
Rewrite 1001k... Rewrite 1001k...
Write 1000k... Write 1000k...
pwrite64: Disk quota exceeded pwrite: Disk quota exceeded
Write 4096... Write 4096...
pwrite64: Disk quota exceeded pwrite: Disk quota exceeded
Touch 3+4 Touch 3+4
Touch 5+6 Touch 5+6
touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded
@@ -23,9 +23,9 @@ touch: cannot touch 'SCRATCH_MNT/file5': Disk quota exceeded
Write 900k... Write 900k...
Rewrite 1001k... Rewrite 1001k...
Write 1000k... Write 1000k...
pwrite64: Disk quota exceeded pwrite: Disk quota exceeded
Write 4096... Write 4096...
pwrite64: Disk quota exceeded pwrite: Disk quota exceeded
Touch 3+4 Touch 3+4
Touch 5+6 Touch 5+6
touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded
tests/generic/271
+2 -1
View File
@@ -81,7 +81,8 @@ md5sum $testdir/file2 | _filter_scratch
echo "CoW and unmount" echo "CoW and unmount"
sync sync
_dmerror_load_error_table _dmerror_load_error_table
$XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 >> $seqres.full $XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 \
2>&1 >> $seqres.full | _filter_xfs_io_error
_dmerror_load_working_table _dmerror_load_working_table
_dmerror_unmount _dmerror_unmount
_dmerror_mount _dmerror_mount
tests/generic/271.out
+1 -1
View File
@@ -5,7 +5,7 @@ Compare files
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file1 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file1
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file2 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file2
CoW and unmount CoW and unmount
pwrite64: Input/output error pwrite: Input/output error
Compare files Compare files
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file1 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-271/file1
Check for damage Check for damage
tests/generic/272
+2 -1
View File
@@ -81,7 +81,8 @@ md5sum $testdir/file2 | _filter_scratch
echo "CoW and unmount" echo "CoW and unmount"
sync sync
_dmerror_load_error_table _dmerror_load_error_table
$XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 >> $seqres.full $XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 \
2>&1 >> $seqres.full | _filter_xfs_io_error
echo "Clean up the mess" echo "Clean up the mess"
_dmerror_unmount _dmerror_unmount
tests/generic/272.out
+1 -1
View File
@@ -5,7 +5,7 @@ Compare files
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file1 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file1
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file2 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file2
CoW and unmount CoW and unmount
pwrite64: Input/output error pwrite: Input/output error
Clean up the mess Clean up the mess
Compare files Compare files
1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file1 1886e67cf8783e89ce6ddc5bb09a3944 SCRATCH_MNT/test-272/file1
tests/generic/276
+2 -1
View File
@@ -81,7 +81,8 @@ md5sum $testdir/file2 | _filter_scratch
echo "CoW and unmount" echo "CoW and unmount"
sync sync
_dmerror_load_error_table _dmerror_load_error_table
$XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 >> $seqres.full $XFS_IO_PROG -d -f -c "pwrite -S 0x63 -b $bufsize 0 $filesize" $testdir/file2 \
2>&1 >> $seqres.full | _filter_xfs_io_error
_dmerror_load_working_table _dmerror_load_working_table
rm -rf $testdir/file2 >> $seqres.full 2>&1 rm -rf $testdir/file2 >> $seqres.full 2>&1
_dmerror_unmount _dmerror_unmount

Some files were not shown because too many files have changed in this diff Show More