xfstest: add a test for the btrfs file extent gap issue
PATCH 1/1 xfstest: add a test for the btrfs file extent gap issue
This is a test to validate that we're not adjusting up i_size before we have the appropriate file extents on disk. We had a problem where i_size would be adjusted up without a contiguous range of file extents, which isn't ok without a special option enabled.
--- tests/btrfs/172 | 74 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/172.out | 3 ++ tests/btrfs/group | 1 + 3 files changed, 78 insertions(+) create mode 100755 tests/btrfs/172 create mode 100644 tests/btrfs/172.out
tests/btrfs/172 new file +74 -0
@@ -0,0 +1,74 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Facebook. All Rights Reserved. +# +# FS QA Test 172 +# +# Validate that without no-holes we do not get an i_size that is after a gap in +# the file extents on disk. This is fixed by the series +# +# btrfs: fix hole corruption issue with !NO_HOLES +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/dmlogwrites + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_log_writes + +_log_writes_init $SCRATCH_DEV +_log_writes_mkfs "-O ^no-holes" >> $seqres.full 2>&1 + +# There's not a straightforward way to commit the transaction without also +# flushing dirty pages, so shorten the commit interval to 5 so we're sure to get +# a commit with our broken file +_log_writes_mount -o commit=5 + +$XFS_IO_PROG -f -c "pwrite 0 5m" $SCRATCH_MNT/file | _filter_xfs_io +$XFS_IO_PROG -f -c "sync_range -abw 2m 1m" $SCRATCH_MNT/file | _filter_xfs_io + +# Now wait for a transaction commit to happen, wait 2x just to be super sure +sleep 10 + +_log_writes_unmount +_log_writes_remove + +cur=$(_log_writes_find_next_fua 0) +echo "cur=$cur" >> $seqres.full +while [ ! -z "$cur" ]; do + _log_writes_replay_log_range $cur $SCRATCH_DEV >> $seqres.full + + # We only care about the fs consistency, so just run fsck, we don't have + # to mount the fs to validate it + _check_scratch_fs + + cur=$(_log_writes_find_next_fua $(($cur + 1))) +done + +# success, all done +status=0 +exit
tests/btrfs/172.out new file +3 -0
@@ -0,0 +1,3 @@ +QA output created by 172 +wrote 5242880/5242880 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
tests/btrfs/group +1 -0
@@ -174,6 +174,7 @@ 169 auto quick send 170 auto quick snapshot 171 auto quick qgroup +172 auto quick 173 auto quick swap 174 auto quick swap 175 auto quick swap volume
Signature · 1 line
2.24.1
Quoted 21 lines · Josef Bacik
This is a test to validate that we're not adjusting up
i_sizebefore we have the appropriate file extents on disk. We had a problem wherei_sizewould be adjusted up without a contiguous range of file extents, which isn't ok without a special option enabled.Signed-off-by Josef Bacik <[email protected]>--- tests/btrfs/172 | 74 +++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/172.out | 3 ++ tests/btrfs/group | 1 + 3 files changed, 78 insertions(+) create mode 100755 tests/btrfs/172 create mode 100644 tests/btrfs/172.outtests/btrfs/172 new file +0
-0
tests/btrfs/172 line 10
Quoted 10 lines
tests/btrfs/172 new file +10
-0@@ -0,0 +1,74 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2020 Facebook. All Rights Reserved. +# +# FS QA Test 172 +# +# Validate that without no-holes we do not get an i_size that is after a gap in +# the file extents on disk. This is fixed by the series +# +# btrfs: fix hole corruption issue with !NO_HOLES
A list of the patch subjects would be better imho, since those are grepable in git.
Quoted 21 lines
tests/btrfs/172 new file +21
-0+# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/dmlogwrites +
tests/btrfs/172 line 41
Quoted 10 lines
tests/btrfs/172 new file +10
-0+# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch +_require_log_writes
Missing: _require_xfs_io_command "sync_range"
Quoted 4 lines
tests/btrfs/172 new file +4
-0+ +_log_writes_init $SCRATCH_DEV +_log_writes_mkfs "-O ^no-holes" >> $seqres.full 2>&1 +
tests/btrfs/172 line 55
Quoted 10 lines
tests/btrfs/172 new file +10
-0+# There's not a straightforward way to commit the transaction without also +# flushing dirty pages, so shorten the commit interval to 5 so we're sure to get +# a commit with our broken file +_log_writes_mount -o commit=5 + +$XFS_IO_PROG -f -c "pwrite 0 5m" $SCRATCH_MNT/file | _filter_xfs_io +$XFS_IO_PROG -f -c "sync_range -abw 2m 1m" $SCRATCH_MNT/file | _filter_xfs_io + +# Now wait for a transaction commit to happen, wait 2x just to be super sure +sleep 10
Could be 6s. Saving test run time for something so trivial.
Quoted 33 lines
tests/btrfs/172 new file +19
-0+ +_log_writes_unmount +_log_writes_remove + +cur=$(_log_writes_find_next_fua 0) +echo "cur=$cur" >> $seqres.full +while [ ! -z "$cur" ]; do + _log_writes_replay_log_range $cur $SCRATCH_DEV >> $seqres.full + + # We only care about the fs consistency, so just run fsck, we don't have + # to mount the fs to validate it + _check_scratch_fs + + cur=$(_log_writes_find_next_fua $(($cur + 1))) +done + +# success, all done +status=0 +exittests/btrfs/172.out new file +3
-0@@ -0,0 +1,3 @@ +QA output created by 172 +wrote 5242880/5242880 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)tests/btrfs/group +0
-0
tests/btrfs/group line 177
Quoted 4 lines
tests/btrfs/group +1
-0@@ -174,6 +174,7 @@ 169 auto quick send 170 auto quick snapshot 171 auto quick qgroup +172 auto quick
Missing 'log' and 'replay' groups, like all other dmlogwrites tests.
Other than that it looks good, thanks.
Quoted 6 lines
tests/btrfs/group +0
-1173 auto quick swap 174 auto quick swap 175 auto quick swap volume --2.24.1
Signature · 3 lines
Filipe David Manana, “Whether you think you can, or you think you can't — you're right.”