diff options
| author | Qu Wenruo <wqu@suse.com> | 2018-01-11 16:01:11 +0800 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2018-01-12 11:40:39 +0800 |
| commit | 3651c38e0b9c7286735c9e71fcc8197f4e1566d6 (patch) | |
| tree | c362b9d7717866ba9d44f8b8ef40687baeedeac5 | |
| parent | 8f20e80747d918a4ea43f8d2e74c6a1e8a6cb890 (diff) | |
| download | xfstests-dev-3651c38e0b9c7286735c9e71fcc8197f4e1566d6.tar.gz | |
filter: Introduce filter to filter out offset for xfs_io
Some test cases (AFAIK, btrfs RAID recovery test cases) read out
certain location to verify its data.
Such read is mostly OK, but the golden output contains the on-disk
offset, which can differ due to underlying chunk change. (This time
is mkfs chunk layout change for btrfs)
So introduce macro _filter_xfs_io_offset to filter out the offset part
wrote 65536/65536 bytes at offset 136708096
^^^^^^^^^^^^^^^^^^^^
And offset from "pread -v"
08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................
^^^^^^^^^
Only btrfs/14[0-3] are affected.
Reported-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rw-r--r-- | common/filter | 10 | ||||
| -rwxr-xr-x | tests/btrfs/140 | 9 | ||||
| -rw-r--r-- | tests/btrfs/140.out | 70 | ||||
| -rwxr-xr-x | tests/btrfs/141 | 9 | ||||
| -rw-r--r-- | tests/btrfs/141.out | 70 | ||||
| -rwxr-xr-x | tests/btrfs/142 | 9 | ||||
| -rw-r--r-- | tests/btrfs/142.out | 70 | ||||
| -rwxr-xr-x | tests/btrfs/143 | 9 | ||||
| -rw-r--r-- | tests/btrfs/143.out | 70 |
9 files changed, 173 insertions, 153 deletions
diff --git a/common/filter b/common/filter index 9c33efacea..8e1fdb4e50 100644 --- a/common/filter +++ b/common/filter @@ -226,6 +226,15 @@ _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)/" } +# 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 +_filter_xfs_io_offset() +{ + # 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:/" +} + # stderr filter for xfs_io to handle change of error output format (e.g. # pwrite64 -> pwrite). _filter_xfs_io_error() @@ -277,7 +286,6 @@ _filter_xfs_io_pages_modified() _filter_xfs_io_units_modified "Page" $PAGE_SIZE } - _filter_test_dir() { # TEST_DEV may be a prefix of TEST_DIR (e.g. /mnt, /mnt/ovl-mnt) diff --git a/tests/btrfs/140 b/tests/btrfs/140 index 985327a09d..cf5751e544 100755 --- a/tests/btrfs/140 +++ b/tests/btrfs/140 @@ -78,7 +78,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 # chunk _scratch_mount -o nospace_cache -$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\ + _filter_xfs_io_offset # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first # one in $SCRATCH_DEV_POOL @@ -89,7 +90,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c physical_on_scratch=`get_physical ${logical_in_btrfs}` _scratch_unmount -$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_mount @@ -109,7 +111,8 @@ done _scratch_unmount # check if the repair works -$XFS_IO_PROG -d -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_dev_pool_put # success, all done diff --git a/tests/btrfs/140.out b/tests/btrfs/140.out index c8565f5398..f3fdf17423 100644 --- a/tests/btrfs/140.out +++ b/tests/btrfs/140.out @@ -1,39 +1,39 @@ QA output created by 140 -wrote 131072/131072 bytes at offset 0 +wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 65536/65536 bytes at offset 136708096 +wrote 65536/65536 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes at offset 136708096 +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 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/btrfs/141 b/tests/btrfs/141 index 709bb0af09..909a2ca322 100755 --- a/tests/btrfs/141 +++ b/tests/btrfs/141 @@ -78,7 +78,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 # chunk _scratch_mount -o nospace_cache -$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\ + _filter_xfs_io_offset # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first # one in $SCRATCH_DEV_POOL @@ -89,7 +90,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c physical_on_scratch=`get_physical ${logical_in_btrfs}` _scratch_unmount -$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_mount @@ -110,7 +112,8 @@ done _scratch_unmount # check if the repair works -$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_dev_pool_put # success, all done diff --git a/tests/btrfs/141.out b/tests/btrfs/141.out index 2e08fc22dd..116f98a290 100644 --- a/tests/btrfs/141.out +++ b/tests/btrfs/141.out @@ -1,39 +1,39 @@ QA output created by 141 -wrote 131072/131072 bytes at offset 0 +wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 65536/65536 bytes at offset 136708096 +wrote 65536/65536 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes at offset 136708096 +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 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/btrfs/142 b/tests/btrfs/142 index 5bd8b728c3..1a6ebb62d3 100755 --- a/tests/btrfs/142 +++ b/tests/btrfs/142 @@ -99,7 +99,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 # chunk _scratch_mount -o nospace_cache,nodatasum -$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\ + _filter_xfs_io_offset # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first # one in $SCRATCH_DEV_POOL @@ -110,7 +111,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c physical_on_scratch=`get_physical ${logical_in_btrfs}` _scratch_unmount -$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_mount -o nospace_cache @@ -135,7 +137,8 @@ stop_fail _scratch_unmount # check if the repair works -$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_dev_pool_put # success, all done diff --git a/tests/btrfs/142.out b/tests/btrfs/142.out index d8be7fbfd0..0f32ffbed6 100644 --- a/tests/btrfs/142.out +++ b/tests/btrfs/142.out @@ -1,39 +1,39 @@ QA output created by 142 -wrote 131072/131072 bytes at offset 0 +wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 65536/65536 bytes at offset 136708096 +wrote 65536/65536 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes at offset 136708096 +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 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/btrfs/143 b/tests/btrfs/143 index 3875b6c43b..848014e078 100755 --- a/tests/btrfs/143 +++ b/tests/btrfs/143 @@ -106,7 +106,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 # chunk _scratch_mount -o nospace_cache,nodatasum -$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\ + _filter_xfs_io_offset # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first # one in $SCRATCH_DEV_POOL @@ -117,7 +118,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c physical_on_scratch=`get_physical ${logical_in_btrfs}` _scratch_unmount -$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_mount -o nospace_cache @@ -142,7 +144,8 @@ done _scratch_unmount # check if the repair works -$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io +$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\ + _filter_xfs_io_offset _scratch_dev_pool_put # success, all done diff --git a/tests/btrfs/143.out b/tests/btrfs/143.out index 97bf45c5af..66afea4ba0 100644 --- a/tests/btrfs/143.out +++ b/tests/btrfs/143.out @@ -1,39 +1,39 @@ QA output created by 143 -wrote 131072/131072 bytes at offset 0 +wrote 131072/131072 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -wrote 65536/65536 bytes at offset 136708096 +wrote 65536/65536 bytes XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ -read 512/512 bytes at offset 136708096 +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 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) |