fstests: add 4Kn support to btrfs tests
PATCH v2 1/1 fstests: add 4Kn support to btrfs tests
xfs_io '-b 512' fail on 4Kn device. because '-b bsize' of xfs_io should be greater than or equal to the sector size of block device.
so replace some 512 with 4096 to support both 4Kn and 512 sector size.
but there are too many dup lines for 4K byte dump, so we use 'uniq' to remove them. this new _filter_xfs_io_offset_uniq() is based on _filter_xfs_io_offset() and 'uniq' is added.
other _filter_xfs_io_offset() in test/btrfs could be replaced by _filter_xfs_io_offset_uniq() too, but we will do this later when necessary.
---
changes since v1:
- add uniq to remove dup lines of xfs_io output
common/filter | 13 ++++++ tests/btrfs/140 | 4 +- tests/btrfs/140.out | 33 +-------------- tests/btrfs/265 | 8 ++-- tests/btrfs/265.out | 66 +----------------------------- tests/btrfs/266 | 12 +++--- tests/btrfs/266.out | 99 ++------------------------------------------- tests/btrfs/267 | 12 +++--- tests/btrfs/267.out | 99 ++------------------------------------------- tests/btrfs/269 | 8 ++-- tests/btrfs/269.out | 33 +-------------- 11 files changed, 45 insertions(+), 342 deletions(-)
common/filter +13 -0
@@ -182,6 +182,19 @@ _filter_xfs_io_offset() _filter_xfs_io | sed -e "s/ at offset [0-9]*$//" -e "s/^[0-9a-f]\+:/XXXXXXXX:/" } +# 1) Also filter out the offset part of xfs_io output +# Some test cases may be affected by underlaying extent/chunk layout change, +# so wipe out this part to avoid golden output difference +# 2) the min I/O size of 4Kn device is 4096, the meaningless dup lines are +# too large, so add 'uniq' to remove them. +_filter_xfs_io_offset_uniq() +{ + # filter out " at offset XXX" and offset of "pread -v" + _filter_xfs_io | + sed -e "s/ at offset [0-9]*$//" -e "s/^[0-9a-f]\+:/XXXXXXXX:/" | + uniq +} + # stderr filter for xfs_io to handle change of error output format (e.g. # pwrite64 -> pwrite). _filter_xfs_io_error()
tests/btrfs/140 +2 -2
@@ -91,8 +91,8 @@ _btrfs_direct_read_on_mirror 1 2 "$SCRATCH_MNT/foobar" 0 128K _scratch_unmount # check if the repair works -$XFS_IO_PROG -d -c "pread -v -b 512 $physical 512" $devpath |\ - _filter_xfs_io_offset +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical 4096" $devpath |\ + _filter_xfs_io_offset_uniq _scratch_dev_pool_put # success, all done
tests/btrfs/140.out +1 -32
@@ -2,36 +2,5 @@ QA output created by 140 wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes +read 4096/4096 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
tests/btrfs/265 +4 -4
@@ -75,10 +75,10 @@ _btrfs_direct_read_on_mirror 1 3 "$SCRATCH_MNT/foobar" 0 128K _scratch_unmount echo "step 4......check if the repair worked" -$XFS_IO_PROG -d -c "pread -v -b 512 $physical1 512" $devpath1 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $physical2 512" $devpath2 |\ - _filter_xfs_io_offset +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical1 4096" $devpath1 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical2 4096" $devpath2 |\ + _filter_xfs_io_offset_uniq _scratch_dev_pool_put # success, all done
tests/btrfs/265.out +2 -64
72 lines not on this page · raw message
tests/btrfs/266 +6 -6
@@ -81,12 +81,12 @@ _btrfs_buffered_read_on_mirror 2 3 "$SCRATCH_MNT/foobar" 0 256K _scratch_unmount echo "step 4......check if the repair worked" -$XFS_IO_PROG -d -c "pread -v -b 512 $physical1 512" $devpath1 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $physical2 512" $devpath2 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $physical3 512" $devpath3 |\ - _filter_xfs_io_offset +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical1 4096" $devpath1 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical2 4096" $devpath2 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical3 4096" $devpath3 |\ + _filter_xfs_io_offset_uniq _scratch_dev_pool_put # success, all done
tests/btrfs/266.out +3 -96
107 lines not on this page · raw message
tests/btrfs/267 +6 -6
@@ -81,12 +81,12 @@ _btrfs_direct_read_on_mirror 2 3 "$SCRATCH_MNT/foobar" 0 256K _scratch_unmount echo "step 4......check if the repair worked" -$XFS_IO_PROG -d -c "pread -v -b 512 $physical1 512" $devpath1 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $physical2 512" $devpath2 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $physical3 512" $devpath3 |\ - _filter_xfs_io_offset +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical1 4096" $devpath1 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical2 4096" $devpath2 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical3 4096" $devpath3 |\ + _filter_xfs_io_offset_uniq _scratch_dev_pool_put # success, all done
tests/btrfs/267.out +3 -96
107 lines not on this page · raw message
tests/btrfs/269 +4 -4
@@ -65,10 +65,10 @@ _btrfs_direct_read_on_mirror 1 2 "$SCRATCH_MNT/foobar" 0 128K _scratch_unmount echo "step 4......check if the repair worked" -$XFS_IO_PROG -d -c "pread -v -b 512 $physical1 512" $devpath1 |\ - _filter_xfs_io_offset -$XFS_IO_PROG -d -c "pread -v -b 512 $((physical4 + 65536)) 512" $devpath4 |\ - _filter_xfs_io_offset +$XFS_IO_PROG -d -c "pread -v -b 4096 $physical1 4096" $devpath1 |\ + _filter_xfs_io_offset_uniq +$XFS_IO_PROG -d -c "pread -v -b 4096 $((physical4 + 65536)) 4096" $devpath4 |\ + _filter_xfs_io_offset_uniq _scratch_dev_pool_put # success, all done
tests/btrfs/269.out +1 -32
@@ -6,36 +6,5 @@ step 2......corrupt file extent step 3......repair the bad copy step 4......check if the repair worked XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -XXXXXXXX: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes +read 4096/4096 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Signature · 1 line
2.36.2