remove _wipe_fs and add a new dump test
v3 cover remove _wipe_fs and add a new dump test
As we talked in version~2 of [PATCH 2/2] [1], Dave said "common/dump::_wipe_fs() is effectively just _scratch_mkfs() followed by mounting it. It does not need to exist at all." So we decided to remove _wipe_fs() function entirely from all xfstests cases.
So:
[PATCH v3 1/2] is a new patch to remove _wipe_fs.
[PATCH v3 2/2] avoid using WIPE_FS parameter
[1]
https://lore.kernel.org/fstests/20220411083433.omc3yvn75k5ap6zk@zlang-mailbox/
Thanks,
Zorro
PATCH v3 1/2 fstests: remove _wipe_fs from dump testing entirely
The _wipe_fs function in common/dump is a historical remnant of xfstests, it's easy to cause confusion now. Now xfstests tend to call require_scratch && scratch_mkfs && scratch_mount in each case itself, we don't need to use a function to do that specially, so remove _wipe_fs entirely.
--- common/dump | 17 ----------------- tests/xfs/022 | 3 +++ tests/xfs/023 | 3 +++ tests/xfs/024 | 3 +++ tests/xfs/025 | 3 +++ tests/xfs/026 | 3 +++ tests/xfs/027 | 3 +++ tests/xfs/028 | 7 +++---- tests/xfs/035 | 3 +++ tests/xfs/036 | 3 +++ tests/xfs/037 | 3 +++ tests/xfs/038 | 3 +++ tests/xfs/039 | 3 +++ tests/xfs/043 | 5 ++++- tests/xfs/046 | 3 +++ tests/xfs/047 | 7 +++---- tests/xfs/055 | 4 ++++ tests/xfs/056 | 3 +++ tests/xfs/059 | 3 +++ tests/xfs/060 | 3 +++ tests/xfs/061 | 3 +++ tests/xfs/063 | 3 +++ tests/xfs/064 | 3 +++ tests/xfs/065 | 3 ++- tests/xfs/066 | 3 +++ tests/xfs/068 | 3 +++ tests/xfs/266 | 3 +++ tests/xfs/267 | 4 +++- tests/xfs/268 | 4 +++- tests/xfs/281 | 4 +++- tests/xfs/282 | 4 +++- tests/xfs/283 | 4 +++- tests/xfs/296 | 4 ++-- tests/xfs/301 | 2 ++ tests/xfs/302 | 3 ++- 35 files changed, 100 insertions(+), 35 deletions(-)
common/dump +0 -17
@@ -217,14 +217,6 @@ _require_tape() _set_variable } -_wipe_fs() -{ - _require_scratch - - _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" - _scratch_mount >>$seqres.full -} - # # Cleanup created dirs and files # Called by trap
@@ -289,7 +281,6 @@ _create_dumpdir_stress_num() echo "Creating directory system to dump using fsstress." _count=$1 - _wipe_fs _param="-f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10" rm -rf $dump_dir
@@ -567,7 +558,6 @@ End-of-File _create_dumpdir_largefile() { - _wipe_fs mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" _largesize=4294967297 _largefile=$dump_dir/largefile
@@ -579,7 +569,6 @@ _create_dumpdir_largefile() _create_dumpdir_fill() { - _wipe_fs _mk_fillconfig1 _do_create_dumpdir_fill _stable_fs
@@ -587,7 +576,6 @@ _create_dumpdir_fill() _create_dumpdir_fill2() { - _wipe_fs _mk_fillconfig2 _do_create_dumpdir_fill _stable_fs
@@ -595,7 +583,6 @@ _create_dumpdir_fill2() _create_dumpdir_fill_perm() { - _wipe_fs _mk_fillconfig_perm _do_create_dumpdir_fill _stable_fs
@@ -603,7 +590,6 @@ _create_dumpdir_fill_perm() _create_dumpdir_fill_ea() { - _wipe_fs _mk_fillconfig_ea _do_create_dumpdir_fill _stable_fs
@@ -615,7 +601,6 @@ _create_dumpdir_fill_ea() # _create_dumpdir_fill_multi() { - _wipe_fs _mk_fillconfig_multi _do_create_dumpdir_fill _stable_fs
@@ -720,7 +705,6 @@ End-of-File _create_dumpdir_symlinks() { - _wipe_fs _mk_symlink_config _do_create_dump_symlinks _stable_fs
@@ -771,7 +755,6 @@ _modify_level() _create_dumpdir_hardlinks() { _numsets=$1 - _wipe_fs echo "Creating directory system of hardlinks to incrementally dump." mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\""
tests/xfs/022 +3 -0
@@ -29,6 +29,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # note: fsstress uses an endian dependent random number generator, running this # will produce different output for big/little endian machines.
tests/xfs/023 +3 -0
@@ -28,6 +28,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_sub
tests/xfs/024 +3 -0
@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2
tests/xfs/025 +3 -0
@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_min
tests/xfs/026 +3 -0
@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_file
tests/xfs/027 +3 -0
@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_restore
tests/xfs/028 +3 -4
@@ -24,10 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumps
tests/xfs/035 +3 -0
@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump -L $seq.1
tests/xfs/036 +3 -0
@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -F
tests/xfs/037 +3 -0
@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -F
tests/xfs/038 +3 -0
@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump
tests/xfs/039 +3 -0
@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump -o -F
tests/xfs/043 +4 -1
@@ -26,7 +26,10 @@ _cleanup() # real QA test starts here _supported_fs xfs -_require_tape $TAPE_DEV +_require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_sub
tests/xfs/046 +3 -0
@@ -22,6 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_symlinks _do_dump_file
tests/xfs/047 +3 -4
@@ -22,10 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumps
tests/xfs/055 +4 -0
@@ -25,6 +25,10 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_USER@$RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount + _create_dumpdir_fill _erase_soft _do_dump -o -F
tests/xfs/056 +3 -0
@@ -25,6 +25,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_perm _do_dump_file
tests/xfs/059 +3 -0
@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4
tests/xfs/060 +3 -0
@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4
tests/xfs/061 +3 -0
@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # src/dumpfile based on dumping from # _create_dumpdir_fill_perm (small dump)
tests/xfs/063 +3 -0
@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # create files with EAs _create_dumpdir_fill_ea
tests/xfs/064 +3 -0
@@ -36,6 +36,9 @@ _ls_size_filter() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_hardlinks 9
tests/xfs/065 +2 -1
@@ -70,7 +70,8 @@ _scratch_unmount # files and directories # -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" cd $dump_dir
tests/xfs/066 +3 -0
@@ -24,6 +24,7 @@ _cleanup() # real QA test starts here _supported_fs xfs _require_test +_require_scratch _my_stat_filter() {
@@ -37,6 +38,8 @@ else _notrun "Installed libc doesn't correctly handle setrlimit/ftruncate64" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_largefile echo "ls dumpdir/largefile" stat $dump_dir/largefile | _my_stat_filter
tests/xfs/068 +3 -0
@@ -28,6 +28,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_stress_num 4096
tests/xfs/266 +3 -0
@@ -50,12 +50,15 @@ filter_cumulative_quota_updates() { # real QA test starts here _supported_fs xfs +_require_scratch $XFSDUMP_PROG -h 2>&1 | grep -q -e -D if [ $? -ne 0 ]; then _notrun "requires xfsdump -D" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2
tests/xfs/267 +3 -1
@@ -34,7 +34,6 @@ _create_files() biggg 41943040 $nobody $nobody 777 attr1 some_text1 root End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }
@@ -48,6 +47,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hard
tests/xfs/268 +3 -1
@@ -37,7 +37,6 @@ bigg1 12582912 $nobody $nobody 777 attr1 some_text1 root bigg2 12582912 $nobody $nobody 777 attr2 some_text2 user End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }
@@ -51,6 +50,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hard
tests/xfs/281 +3 -1
@@ -22,8 +22,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill
tests/xfs/282 +3 -1
@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp
tests/xfs/283 +3 -1
@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp
tests/xfs/296 +2 -2
@@ -28,8 +28,8 @@ _supported_fs xfs _require_scratch _require_command "$SETCAP_PROG" setcap _require_command "$GETCAP_PROG" getcap - -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir echo test > $dump_dir/testfile
tests/xfs/301 +2 -0
@@ -27,6 +27,8 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # Extended attributes attr_name=attrname
tests/xfs/302 +2 -1
@@ -26,9 +26,10 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount echo "Silence is golden." -_wipe_fs mkdir $dump_dir >> $seqres.full 2>&1 || _fail "mkdir \"$dump_dir\" failed" for i in `seq 1 4`; do $XFS_IO_PROG -f -c "truncate 1t" $dump_dir/sparsefile$i \
Signature · 1 line
2.31.1
Re: [PATCH v3 1/2] fstests: remove _wipe_fs from dump testing entirely
Quoted 65 lines · Zorro Lang
The
_wipe_fsfunction in common/dump is a historical remnant of xfstests, it's easy to cause confusion now. Now xfstests tend to callrequire_scratch && scratch_mkfs && scratch_mountin each case itself, we don't need to use a function to do that specially, so remove_wipe_fsentirely.Signed-off-by Zorro Lang <[email protected]>--- common/dump | 17 ----------------- tests/xfs/022 | 3 +++ tests/xfs/023 | 3 +++ tests/xfs/024 | 3 +++ tests/xfs/025 | 3 +++ tests/xfs/026 | 3 +++ tests/xfs/027 | 3 +++ tests/xfs/028 | 7 +++---- tests/xfs/035 | 3 +++ tests/xfs/036 | 3 +++ tests/xfs/037 | 3 +++ tests/xfs/038 | 3 +++ tests/xfs/039 | 3 +++ tests/xfs/043 | 5 ++++- tests/xfs/046 | 3 +++ tests/xfs/047 | 7 +++---- tests/xfs/055 | 4 ++++ tests/xfs/056 | 3 +++ tests/xfs/059 | 3 +++ tests/xfs/060 | 3 +++ tests/xfs/061 | 3 +++ tests/xfs/063 | 3 +++ tests/xfs/064 | 3 +++ tests/xfs/065 | 3 ++- tests/xfs/066 | 3 +++ tests/xfs/068 | 3 +++ tests/xfs/266 | 3 +++ tests/xfs/267 | 4 +++- tests/xfs/268 | 4 +++- tests/xfs/281 | 4 +++- tests/xfs/282 | 4 +++- tests/xfs/283 | 4 +++- tests/xfs/296 | 4 ++-- tests/xfs/301 | 2 ++ tests/xfs/302 | 3 ++- 35 files changed, 100 insertions(+), 35 deletions(-)common/dump +0
-8@@ -217,14 +217,6 @@ _require_tape() _set_variable } -_wipe_fs() -{ - _require_scratch - - _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" - _scratch_mount >>$seqres.full -} - # # Cleanup created dirs and files # Called by trap
common/dump _create_dumpdir_stress_num() · line 292
Quoted 4 lines
common/dump +0
-1@@ -289,7 +281,6 @@ _create_dumpdir_stress_num() echo "Creating directory system to dump using fsstress." _count=$1 - _wipe_fs
The _create_dumpdir* helpers no longer format and mount the filesystem? What about the case of xfs/035 where we write an fs, dump it, create *another* fs, dump that, and restore the second dump? The scratch fs no longer gets reformatted, AFAICT.
I think it's appropriate to move the _require_scratch to into the calling tests themselves, but I think the mkfs+mount should replace the _wipe_fs calls in all these helper functions.
--D
Quoted 594 lines
common/dump +0
-8_param="-f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10" rm -rf $dump_dir@@ -567,7 +558,6 @@ End-of-File _create_dumpdir_largefile() { - _wipe_fs mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" _largesize=4294967297 _largefile=$dump_dir/largefile@@ -579,7 +569,6 @@ _create_dumpdir_largefile() _create_dumpdir_fill() { - _wipe_fs _mk_fillconfig1 _do_create_dumpdir_fill _stable_fs@@ -587,7 +576,6 @@ _create_dumpdir_fill() _create_dumpdir_fill2() { - _wipe_fs _mk_fillconfig2 _do_create_dumpdir_fill _stable_fs@@ -595,7 +583,6 @@ _create_dumpdir_fill2() _create_dumpdir_fill_perm() { - _wipe_fs _mk_fillconfig_perm _do_create_dumpdir_fill _stable_fs@@ -603,7 +590,6 @@ _create_dumpdir_fill_perm() _create_dumpdir_fill_ea() { - _wipe_fs _mk_fillconfig_ea _do_create_dumpdir_fill _stable_fs@@ -615,7 +601,6 @@ _create_dumpdir_fill_ea() # _create_dumpdir_fill_multi() { - _wipe_fs _mk_fillconfig_multi _do_create_dumpdir_fill _stable_fs@@ -720,7 +705,6 @@ End-of-File _create_dumpdir_symlinks() { - _wipe_fs _mk_symlink_config _do_create_dump_symlinks _stable_fs@@ -771,7 +755,6 @@ _modify_level() _create_dumpdir_hardlinks() { _numsets=$1 - _wipe_fs echo "Creating directory system of hardlinks to incrementally dump." mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\""tests/xfs/022 +3
-0@@ -29,6 +29,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # note: fsstress uses an endian dependent random number generator, running this # will produce different output for big/little endian machines.tests/xfs/023 +3
-0@@ -28,6 +28,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_subtests/xfs/024 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2tests/xfs/025 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_mintests/xfs/026 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_filetests/xfs/027 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_restoretests/xfs/028 +3
-4@@ -24,10 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumpstests/xfs/035 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump -L $seq.1tests/xfs/036 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -Ftests/xfs/037 +3
-0@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -Ftests/xfs/038 +3
-0@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dumptests/xfs/039 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump -o -Ftests/xfs/043 +4
-1@@ -26,7 +26,10 @@ _cleanup() # real QA test starts here _supported_fs xfs -_require_tape $TAPE_DEV +_require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_subtests/xfs/046 +3
-0@@ -22,6 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_symlinks _do_dump_filetests/xfs/047 +3
-4@@ -22,10 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumpstests/xfs/055 +4
-0@@ -25,6 +25,10 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_USER@$RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount + _create_dumpdir_fill _erase_soft _do_dump -o -Ftests/xfs/056 +3
-0@@ -25,6 +25,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_perm _do_dump_filetests/xfs/059 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4tests/xfs/060 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4tests/xfs/061 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # src/dumpfile based on dumping from # _create_dumpdir_fill_perm (small dump)tests/xfs/063 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # create files with EAs _create_dumpdir_fill_eatests/xfs/064 +3
-0@@ -36,6 +36,9 @@ _ls_size_filter() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_hardlinks 9tests/xfs/065 +2
-1@@ -70,7 +70,8 @@ _scratch_unmount # files and directories # -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" cd $dump_dirtests/xfs/066 +3
-0@@ -24,6 +24,7 @@ _cleanup() # real QA test starts here _supported_fs xfs _require_test +_require_scratch _my_stat_filter() {@@ -37,6 +38,8 @@ else _notrun "Installed libc doesn't correctly handle setrlimit/ftruncate64" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_largefile echo "ls dumpdir/largefile" stat $dump_dir/largefile | _my_stat_filtertests/xfs/068 +3
-0@@ -28,6 +28,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_stress_num 4096tests/xfs/266 +3
-0@@ -50,12 +50,15 @@ filter_cumulative_quota_updates() { # real QA test starts here _supported_fs xfs +_require_scratch $XFSDUMP_PROG -h 2>&1 | grep -q -e -D if [ $? -ne 0 ]; then _notrun "requires xfsdump -D" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2tests/xfs/267 +3
-1@@ -34,7 +34,6 @@ _create_files() biggg 41943040 $nobody $nobody 777 attr1 some_text1 root End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }@@ -48,6 +47,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hardtests/xfs/268 +3
-1@@ -37,7 +37,6 @@ bigg1 12582912 $nobody $nobody 777 attr1 some_text1 root bigg2 12582912 $nobody $nobody 777 attr2 some_text2 user End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }@@ -51,6 +50,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hardtests/xfs/281 +3
-1@@ -22,8 +22,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_filltests/xfs/282 +3
-1@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamptests/xfs/283 +3
-1@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamptests/xfs/296 +2
-2@@ -28,8 +28,8 @@ _supported_fs xfs _require_scratch _require_command "$SETCAP_PROG" setcap _require_command "$GETCAP_PROG" getcap - -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir echo test > $dump_dir/testfiletests/xfs/301 +2
-0@@ -27,6 +27,8 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # Extended attributes attr_name=attrnametests/xfs/302 +2
-1@@ -26,9 +26,10 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount echo "Silence is golden." -_wipe_fs mkdir $dump_dir >> $seqres.full 2>&1 || _fail "mkdir \"$dump_dir\" failed" for i in `seq 1 4`; do $XFS_IO_PROG -f -c "truncate 1t" $dump_dir/sparsefile$i \Signature · 1 line
2.31.1
Re: [PATCH v3 1/2] fstests: remove _wipe_fs from dump testing entirely
Quoted 68 lines · Darrick J. Wong
Quoted 67 lines · Zorro Lang
The
_wipe_fsfunction in common/dump is a historical remnant of xfstests, it's easy to cause confusion now. Now xfstests tend to callrequire_scratch && scratch_mkfs && scratch_mountin each case itself, we don't need to use a function to do that specially, so remove_wipe_fsentirely.Signed-off-by Zorro Lang <[email protected]>--- common/dump | 17 ----------------- tests/xfs/022 | 3 +++ tests/xfs/023 | 3 +++ tests/xfs/024 | 3 +++ tests/xfs/025 | 3 +++ tests/xfs/026 | 3 +++ tests/xfs/027 | 3 +++ tests/xfs/028 | 7 +++---- tests/xfs/035 | 3 +++ tests/xfs/036 | 3 +++ tests/xfs/037 | 3 +++ tests/xfs/038 | 3 +++ tests/xfs/039 | 3 +++ tests/xfs/043 | 5 ++++- tests/xfs/046 | 3 +++ tests/xfs/047 | 7 +++---- tests/xfs/055 | 4 ++++ tests/xfs/056 | 3 +++ tests/xfs/059 | 3 +++ tests/xfs/060 | 3 +++ tests/xfs/061 | 3 +++ tests/xfs/063 | 3 +++ tests/xfs/064 | 3 +++ tests/xfs/065 | 3 ++- tests/xfs/066 | 3 +++ tests/xfs/068 | 3 +++ tests/xfs/266 | 3 +++ tests/xfs/267 | 4 +++- tests/xfs/268 | 4 +++- tests/xfs/281 | 4 +++- tests/xfs/282 | 4 +++- tests/xfs/283 | 4 +++- tests/xfs/296 | 4 ++-- tests/xfs/301 | 2 ++ tests/xfs/302 | 3 ++- 35 files changed, 100 insertions(+), 35 deletions(-)common/dump +0
-8@@ -217,14 +217,6 @@ _require_tape() _set_variable } -_wipe_fs() -{ - _require_scratch - - _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" - _scratch_mount >>$seqres.full -} - # # Cleanup created dirs and files # Called by trap@@ -289,7 +281,6 @@ _create_dumpdir_stress_num() echo "Creating directory system to dump using fsstress."
Quoted 7 lines
common/dump _create_dumpdir_stress_num() · line 292
Quoted 2 lines
common/dump +0
-1_count=$1 - _wipe_fsThe _create_dumpdir* helpers no longer format and mount the filesystem? What about the case of xfs/035 where we write an fs, dump it, create *another* fs, dump that, and restore the second dump? The scratch fs no longer gets reformatted, AFAICT.
Oh, I didn't notice that xfs/035 has another _create_dumpdir_fill2. How about mkfs and mount SCRATCH_DEV again, before calling _create_dumpdir_fill2:
_scratch_unmount
_scratch_mkfs_xfs >>$seqres.full
_scratch_mount
It might be also clear that the case re-create fs before _create_dumpdir_*. I'll fix that in next version.
Quoted 4 lines
I think it's appropriate to move the
_require_scratchto into the calling tests themselves, but I think the mkfs+mount should replace the_wipe_fscalls in all these helper functions.
I think the _create_dumpdir_* isn't necessary to be run on a clean filesystem which just be mkfs. If a case need a clean filesystem, how about let them clean it by themselves clearly :)
Thanks,
Zorro
Quoted 598 lines
--D
Quoted 594 lines
common/dump +0
-8_param="-f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10" rm -rf $dump_dir@@ -567,7 +558,6 @@ End-of-File _create_dumpdir_largefile() { - _wipe_fs mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" _largesize=4294967297 _largefile=$dump_dir/largefile@@ -579,7 +569,6 @@ _create_dumpdir_largefile() _create_dumpdir_fill() { - _wipe_fs _mk_fillconfig1 _do_create_dumpdir_fill _stable_fs@@ -587,7 +576,6 @@ _create_dumpdir_fill() _create_dumpdir_fill2() { - _wipe_fs _mk_fillconfig2 _do_create_dumpdir_fill _stable_fs@@ -595,7 +583,6 @@ _create_dumpdir_fill2() _create_dumpdir_fill_perm() { - _wipe_fs _mk_fillconfig_perm _do_create_dumpdir_fill _stable_fs@@ -603,7 +590,6 @@ _create_dumpdir_fill_perm() _create_dumpdir_fill_ea() { - _wipe_fs _mk_fillconfig_ea _do_create_dumpdir_fill _stable_fs@@ -615,7 +601,6 @@ _create_dumpdir_fill_ea() # _create_dumpdir_fill_multi() { - _wipe_fs _mk_fillconfig_multi _do_create_dumpdir_fill _stable_fs@@ -720,7 +705,6 @@ End-of-File _create_dumpdir_symlinks() { - _wipe_fs _mk_symlink_config _do_create_dump_symlinks _stable_fs@@ -771,7 +755,6 @@ _modify_level() _create_dumpdir_hardlinks() { _numsets=$1 - _wipe_fs echo "Creating directory system of hardlinks to incrementally dump." mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\""tests/xfs/022 +3
-0@@ -29,6 +29,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # note: fsstress uses an endian dependent random number generator, running this # will produce different output for big/little endian machines.tests/xfs/023 +3
-0@@ -28,6 +28,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_subtests/xfs/024 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2tests/xfs/025 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_mintests/xfs/026 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_filetests/xfs/027 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _do_dump_restoretests/xfs/028 +3
-4@@ -24,10 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumpstests/xfs/035 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump -L $seq.1tests/xfs/036 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -Ftests/xfs/037 +3
-0@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump_min -o -Ftests/xfs/038 +3
-0@@ -24,6 +24,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dumptests/xfs/039 +3
-0@@ -25,6 +25,9 @@ _cleanup() _supported_fs xfs _require_tape $RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_soft _do_dump -o -Ftests/xfs/043 +4
-1@@ -26,7 +26,10 @@ _cleanup() # real QA test starts here _supported_fs xfs -_require_tape $TAPE_DEV +_require_tape $TAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill _erase_hard _do_dump_subtests/xfs/046 +3
-0@@ -22,6 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_symlinks _do_dump_filetests/xfs/047 +3
-4@@ -22,10 +22,9 @@ _cleanup() # real QA test starts here _supported_fs xfs - -# wipe test dir clean first -# so dump can be real quick -_wipe_fs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # # Create 5 dumpstests/xfs/055 +4
-0@@ -25,6 +25,10 @@ _cleanup() _supported_fs xfs _require_tape $RMT_TAPE_USER@$RMT_IRIXTAPE_DEV +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount + _create_dumpdir_fill _erase_soft _do_dump -o -Ftests/xfs/056 +3
-0@@ -25,6 +25,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_perm _do_dump_filetests/xfs/059 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4tests/xfs/060 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_multi_stream +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill_multi _do_dump_multi_file --multi 4tests/xfs/061 +3
-0@@ -24,6 +24,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # src/dumpfile based on dumping from # _create_dumpdir_fill_perm (small dump)tests/xfs/063 +3
-0@@ -26,6 +26,9 @@ _cleanup() _supported_fs xfs _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # create files with EAs _create_dumpdir_fill_eatests/xfs/064 +3
-0@@ -36,6 +36,9 @@ _ls_size_filter() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_hardlinks 9tests/xfs/065 +2
-1@@ -70,7 +70,8 @@ _scratch_unmount # files and directories # -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir || _fail "cannot mkdir \"$dump_dir\"" cd $dump_dirtests/xfs/066 +3
-0@@ -24,6 +24,7 @@ _cleanup() # real QA test starts here _supported_fs xfs _require_test +_require_scratch _my_stat_filter() {@@ -37,6 +38,8 @@ else _notrun "Installed libc doesn't correctly handle setrlimit/ftruncate64" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_largefile echo "ls dumpdir/largefile" stat $dump_dir/largefile | _my_stat_filtertests/xfs/068 +3
-0@@ -28,6 +28,9 @@ _cleanup() # real QA test starts here _supported_fs xfs +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_stress_num 4096tests/xfs/266 +3
-0@@ -50,12 +50,15 @@ filter_cumulative_quota_updates() { # real QA test starts here _supported_fs xfs +_require_scratch $XFSDUMP_PROG -h 2>&1 | grep -q -e -D if [ $? -ne 0 ]; then _notrun "requires xfsdump -D" fi +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamp sleep 2tests/xfs/267 +3
-1@@ -34,7 +34,6 @@ _create_files() biggg 41943040 $nobody $nobody 777 attr1 some_text1 root End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }@@ -48,6 +47,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hardtests/xfs/268 +3
-1@@ -37,7 +37,6 @@ bigg1 12582912 $nobody $nobody 777 attr1 some_text1 root bigg2 12582912 $nobody $nobody 777 attr2 some_text2 user End-of-File - _wipe_fs _do_create_dumpdir_fill _stable_fs }@@ -51,6 +50,9 @@ _supported_fs xfs _require_tape $TAPE_DEV _require_attrs trusted user +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_files _erase_hardtests/xfs/281 +3
-1@@ -22,8 +22,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_filltests/xfs/282 +3
-1@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamptests/xfs/283 +3
-1@@ -24,8 +24,10 @@ _cleanup() # real QA test starts here _supported_fs xfs - _require_legacy_v2_format +_require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount _create_dumpdir_fill # ensure file/dir timestamps precede dump timestamptests/xfs/296 +2
-2@@ -28,8 +28,8 @@ _supported_fs xfs _require_scratch _require_command "$SETCAP_PROG" setcap _require_command "$GETCAP_PROG" getcap - -_wipe_fs +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount mkdir -p $dump_dir echo test > $dump_dir/testfiletests/xfs/301 +2
-0@@ -27,6 +27,8 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount # Extended attributes attr_name=attrnametests/xfs/302 +2
-1@@ -26,9 +26,10 @@ _cleanup() # Modify as appropriate. _supported_fs xfs _require_scratch +_scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" +_scratch_mount echo "Silence is golden." -_wipe_fs mkdir $dump_dir >> $seqres.full 2>&1 || _fail "mkdir \"$dump_dir\" failed" for i in `seq 1 4`; do $XFS_IO_PROG -f -c "truncate 1t" $dump_dir/sparsefile$i \Signature · 1 line
2.31.1
PATCH v3 2/2 xfs: test xfsdump when an inode < root inode is present
In reply to Zorro LangFrom: Eric Sandeen <[email protected]>
This tests a longstanding bug where xfsdumps are not properly created when an inode is present on the filesytsem which has a lower number than the root inode.
--- tests/xfs/999 | 62 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/999.out | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100755 tests/xfs/999 create mode 100644 tests/xfs/999.out
tests/xfs/999 new file +62 -0
@@ -0,0 +1,62 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 999 +# +# Create a filesystem which contains an inode with a lower number +# than the root inode. Ensure that xfsdump/xfsrestore handles this. +# +. ./common/preamble +_begin_fstest auto quick dump + +# Import common functions. +. ./common/dump + +_supported_fs xfs +_require_scratch + +# A large stripe unit will put the root inode out quite far +# due to alignment, leaving free blocks ahead of it. +_scratch_mkfs_xfs -d sunit=1024,swidth=1024 > $seqres.full 2>&1 + +# Mounting /without/ a stripe should allow inodes to be allocated +# in lower free blocks, without the stripe alignment. +_scratch_mount -o sunit=0,swidth=0 + +root_inum=$(stat -c %i $SCRATCH_MNT) + +# Consume space after the root inode so that the blocks before +# root look "close" for the next inode chunk allocation +$XFS_IO_PROG -f -c "falloc 0 16m" $SCRATCH_MNT/fillfile + +# And make a bunch of inodes until we (hopefully) get one lower +# than root, in a new inode chunk. +echo "root_inum: $root_inum" >> $seqres.full +for i in $(seq 0 4096) ; do + fname=$SCRATCH_MNT/$(printf "FILE_%03d" $i) + touch $fname + inum=$(stat -c "%i" $fname) + [[ $inum -lt $root_inum ]] && break +done + +echo "created: $inum" >> $seqres.full + +[[ $inum -lt $root_inum ]] || _notrun "Could not set up test" + +# Now try a dump and restore. Cribbed from xfs/068 +_create_dumpdir_stress + +echo -n "Before: " >> $seqres.full +_count_dumpdir_files | tee $tmp.before >> $seqres.full + +# filter out the file count, it changes as fsstress adds new operations +_do_dump_restore | sed -e "/entries processed$/s/[0-9][0-9]*/NUM/g" + +echo -n "After: " >> $seqres.full +_count_restoredir_files | tee $tmp.after >> $seqres.full +diff -u $tmp.before $tmp.after + +# success, all done +status=0 +exit
tests/xfs/999.out new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.31.1
Re: [PATCH v3 2/2] xfs: test xfsdump when an inode < root inode is present
Quoted 8 lines · Zorro Lang
From: Eric Sandeen <[email protected]>
This tests a longstanding bug where xfsdumps are not properly created when an inode is present on the filesytsem which has a lower number than the root inode.
Signed-off-by Eric Sandeen <[email protected]>Signed-off-by Zorro Lang <[email protected]>
LGTM
--D
Quoted 131 lines
--- tests/xfs/999 | 62 +++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/999.out | 47 +++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100755 tests/xfs/999 create mode 100644 tests/xfs/999.outtests/xfs/999 new file +62
-0@@ -0,0 +1,62 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2022 Red Hat, Inc. All Rights Reserved. +# +# FS QA Test No. 999 +# +# Create a filesystem which contains an inode with a lower number +# than the root inode. Ensure that xfsdump/xfsrestore handles this. +# +. ./common/preamble +_begin_fstest auto quick dump + +# Import common functions. +. ./common/dump + +_supported_fs xfs +_require_scratch + +# A large stripe unit will put the root inode out quite far +# due to alignment, leaving free blocks ahead of it. +_scratch_mkfs_xfs -d sunit=1024,swidth=1024 > $seqres.full 2>&1 + +# Mounting /without/ a stripe should allow inodes to be allocated +# in lower free blocks, without the stripe alignment. +_scratch_mount -o sunit=0,swidth=0 + +root_inum=$(stat -c %i $SCRATCH_MNT) + +# Consume space after the root inode so that the blocks before +# root look "close" for the next inode chunk allocation +$XFS_IO_PROG -f -c "falloc 0 16m" $SCRATCH_MNT/fillfile + +# And make a bunch of inodes until we (hopefully) get one lower +# than root, in a new inode chunk. +echo "root_inum: $root_inum" >> $seqres.full +for i in $(seq 0 4096) ; do + fname=$SCRATCH_MNT/$(printf "FILE_%03d" $i) + touch $fname + inum=$(stat -c "%i" $fname) + [[ $inum -lt $root_inum ]] && break +done + +echo "created: $inum" >> $seqres.full + +[[ $inum -lt $root_inum ]] || _notrun "Could not set up test" + +# Now try a dump and restore. Cribbed from xfs/068 +_create_dumpdir_stress + +echo -n "Before: " >> $seqres.full +_count_dumpdir_files | tee $tmp.before >> $seqres.full + +# filter out the file count, it changes as fsstress adds new operations +_do_dump_restore | sed -e "/entries processed$/s/[0-9][0-9]*/NUM/g" + +echo -n "After: " >> $seqres.full +_count_restoredir_files | tee $tmp.after >> $seqres.full +diff -u $tmp.before $tmp.after + +# success, all done +status=0 +exittests/xfs/999.out new file +47
-0@@ -0,0 +1,47 @@ +QA output created by 999 +Creating directory system to dump using fsstress. + +----------------------------------------------- +fsstress : -f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10 +----------------------------------------------- +xfsdump|xfsrestore ... +xfsdump -s DUMP_SUBDIR - SCRATCH_MNT | xfsrestore - RESTORE_DIR +xfsrestore: using file dump (drive_simple) strategy +xfsrestore: searching media for dump +xfsrestore: examining media file 0 +xfsrestore: dump description: +xfsrestore: hostname: HOSTNAME +xfsrestore: mount point: SCRATCH_MNT +xfsrestore: volume: SCRATCH_DEV +xfsrestore: session time: TIME +xfsrestore: level: 0 +xfsrestore: session label: "" +xfsrestore: media label: "" +xfsrestore: file system ID: ID +xfsrestore: session id: ID +xfsrestore: media ID: ID +xfsrestore: searching media for directory dump +xfsrestore: reading directories +xfsrestore: NUM directories and NUM entries processed +xfsrestore: directory post-processing +xfsrestore: restoring non-directory files +xfsrestore: restore complete: SECS seconds elapsed +xfsrestore: Restore Status: SUCCESS +xfsdump: using file dump (drive_simple) strategy +xfsdump: level 0 dump of HOSTNAME:SCRATCH_MNT +xfsdump: dump date: DATE +xfsdump: session id: ID +xfsdump: session label: "" +xfsdump: ino map <PHASES> +xfsdump: ino map construction complete +xfsdump: estimated dump size: NUM bytes +xfsdump: /var/xfsdump/inventory created +xfsdump: creating dump session media file 0 (media 0, file 0) +xfsdump: dumping ino map +xfsdump: dumping directories +xfsdump: dumping non-directory files +xfsdump: ending media file +xfsdump: media file size NUM bytes +xfsdump: dump size (non-dir files) : NUM bytes +xfsdump: dump complete: SECS seconds elapsed +xfsdump: Dump Status: SUCCESSSignature · 1 line
2.31.1