fstests: generic/353 should accomodate other pwrite behaviors
PATCH 1/1 fstests: generic/353 should accomodate other pwrite behaviors
xfs_io pwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.
Modify test to use actual blocksize for pwrite and reflink. Also modify it to accommodate pwrite and reflink that produce different mapping results.
--- tests/generic/353 | 27 ++++++++++++++------------- tests/generic/353.out | 14 -------------- 2 files changed, 14 insertions(+), 27 deletions(-)
tests/generic/353 +14 -13
@@ -29,31 +29,32 @@ _require_xfs_io_command "fiemap" _scratch_mkfs > /dev/null 2>&1 _scratch_mount -blocksize=64k +blocksize=$(_get_file_block_size $SCRATCH_MNT) + file1="$SCRATCH_MNT/file1" file2="$SCRATCH_MNT/file2" +extmap1="$SCRATCH_MNT/extmap1" +extmap2="$SCRATCH_MNT/extmap2" # write the initial file -_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 | _filter_xfs_io +_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 > /dev/null # reflink initial file -_reflink_range $file1 0 $file2 0 $blocksize | _filter_xfs_io +_reflink_range $file1 0 $file2 0 $blocksize > /dev/null # check their fiemap to make sure it's correct -echo "before sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps before sync" # sync and recheck, to make sure the fiemap doesn't change just # due to sync sync -echo "after sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps after sync" # success, all done status=0
tests/generic/353.out +0 -14
@@ -1,15 +1 @@ QA output created by 353 -wrote 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -linked 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -before sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last -after sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last
Signature · 1 line
2.41.0
cc Qu Wenruo
Quoted 88 lines · Bill O'Donnell
xfs_iopwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.Modify test to use actual blocksize for pwrite and reflink. Also modify it to accommodate pwrite and reflink that produce different mapping results.
Signed-off-by Bill O'Donnell <[email protected]>--- tests/generic/353 | 27 ++++++++++++++------------- tests/generic/353.out | 14 -------------- 2 files changed, 14 insertions(+), 27 deletions(-)tests/generic/353 +14
-13@@ -29,31 +29,32 @@ _require_xfs_io_command "fiemap" _scratch_mkfs > /dev/null 2>&1 _scratch_mount -blocksize=64k +blocksize=$(_get_file_block_size $SCRATCH_MNT) + file1="$SCRATCH_MNT/file1" file2="$SCRATCH_MNT/file2" +extmap1="$SCRATCH_MNT/extmap1" +extmap2="$SCRATCH_MNT/extmap2" # write the initial file -_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 | _filter_xfs_io +_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 > /dev/null # reflink initial file -_reflink_range $file1 0 $file2 0 $blocksize | _filter_xfs_io +_reflink_range $file1 0 $file2 0 $blocksize > /dev/null # check their fiemap to make sure it's correct -echo "before sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps before sync" # sync and recheck, to make sure the fiemap doesn't change just # due to sync sync -echo "after sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps after sync" # success, all done status=0tests/generic/353.out +0
-14@@ -1,15 +1 @@ QA output created by 353 -wrote 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -linked 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -before sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last -after sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|lastSignature · 1 line
2.41.0
Quoted 75 lines · Bill O'Donnell
xfs_iopwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.Modify test to use actual blocksize for pwrite and reflink. Also modify it to accommodate pwrite and reflink that produce different mapping results.
Signed-off-by Bill O'Donnell <[email protected]>--- tests/generic/353 | 27 ++++++++++++++------------- tests/generic/353.out | 14 -------------- 2 files changed, 14 insertions(+), 27 deletions(-)tests/generic/353 +14
-13@@ -29,31 +29,32 @@ _require_xfs_io_command "fiemap" _scratch_mkfs > /dev/null 2>&1 _scratch_mount -blocksize=64k +blocksize=$(_get_file_block_size $SCRATCH_MNT) + file1="$SCRATCH_MNT/file1" file2="$SCRATCH_MNT/file2" +extmap1="$SCRATCH_MNT/extmap1" +extmap2="$SCRATCH_MNT/extmap2" # write the initial file -_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 | _filter_xfs_io +_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 > /dev/null # reflink initial file -_reflink_range $file1 0 $file2 0 $blocksize | _filter_xfs_io +_reflink_range $file1 0 $file2 0 $blocksize > /dev/null # check their fiemap to make sure it's correct -echo "before sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps before sync" # sync and recheck, to make sure the fiemap doesn't change just # due to sync sync -echo "after sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps after sync" # success, all done status=0tests/generic/353.out +0
-4@@ -1,15 +1 @@ QA output created by 353 -wrote 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -linked 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
tests/generic/353.out line 15
Quoted 10 lines
tests/generic/353.out +0
-10-before sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last -after sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last
If you hope to remove all output messages, we generally have a "Silence is golden".
Quoted 3 lines
Signature · 1 line
2.41.0
Quoted 81 lines · Zorro Lang
Quoted 80 lines · Bill O'Donnell
xfs_iopwrite issues a series of block size writes, but there is no guarantee that the resulting extent(s) will be singular or contiguous. This behavior is acceptable, but the test is flawed in that it expects a single extent for a pwrite.Modify test to use actual blocksize for pwrite and reflink. Also modify it to accommodate pwrite and reflink that produce different mapping results.
Signed-off-by Bill O'Donnell <[email protected]>--- tests/generic/353 | 27 ++++++++++++++------------- tests/generic/353.out | 14 -------------- 2 files changed, 14 insertions(+), 27 deletions(-)tests/generic/353 +14
-13@@ -29,31 +29,32 @@ _require_xfs_io_command "fiemap" _scratch_mkfs > /dev/null 2>&1 _scratch_mount -blocksize=64k +blocksize=$(_get_file_block_size $SCRATCH_MNT) + file1="$SCRATCH_MNT/file1" file2="$SCRATCH_MNT/file2" +extmap1="$SCRATCH_MNT/extmap1" +extmap2="$SCRATCH_MNT/extmap2" # write the initial file -_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 | _filter_xfs_io +_pwrite_byte 0xcdcdcdcd 0 $blocksize $file1 > /dev/null # reflink initial file -_reflink_range $file1 0 $file2 0 $blocksize | _filter_xfs_io +_reflink_range $file1 0 $file2 0 $blocksize > /dev/null # check their fiemap to make sure it's correct -echo "before sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps before sync" # sync and recheck, to make sure the fiemap doesn't change just # due to sync sync -echo "after sync:" -echo "$file1" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags -echo "$file2" | _filter_scratch -$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags +$XFS_IO_PROG -c "fiemap -v" $file1 | _filter_fiemap_flags > $extmap1 +$XFS_IO_PROG -c "fiemap -v" $file2 | _filter_fiemap_flags > $extmap2 + +cmp -s $extmap1 $extmap2 || echo "mismatched extent maps after sync" # success, all done status=0tests/generic/353.out +0
-9@@ -1,15 +1 @@ QA output created by 353 -wrote 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -linked 65536/65536 bytes at offset 0 -XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) -before sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|last
Quoted 8 lines
tests/generic/353.out line 15
Quoted 5 lines
tests/generic/353.out +0
-5-after sync: -SCRATCH_MNT/file1 -0: [0..127]: shared|last -SCRATCH_MNT/file2 -0: [0..127]: shared|lastIf you hope to remove all output messages, we generally have a "Silence is golden".
I thought about that and forgot to do it. I'll send a v2. Thanks-
Bill
Quoted 5 lines
Quoted 4 lines
Signature · 2 lines
-- 2.41.0