_fail test by default if _scratch_mount fails
cover _fail test by default if _scratch_mount fails
Hi all,
This is an RFC patchset that follows Andreas Gruenbacher's recent post "Failing scratch mounts"[1]. It changes _scratch_mount to call _fail on mount failure by default, so that when the mount fails, the tests won't write to the underlying filesystem and fail in implicit way, which sometimes makes debugging harder to do.
Also introduce a new _scratch_mount_nocheck helper, which mount scratch device and doesn't check the mount status, for tests that need to check mount status themselves.
This two-patch patchset should really be one patch, but for easy review, I split the patch into two pieces, the first patch introduce the new _scratch_mount_nocheck helper and converts _scratch_mount usages in common dir, the second patch converts all the tests (which can be tedious).
I've tested it by running full '-g auto' tests against xfs/xfs with reflink/ext4/btrfs and I didn't see any new failures.
(Note that I based this patchset against fstests release on Feb. 4th, so I didn't convert the new tests release on Feb. 11th. And as this is an RFC, I didn't write detailed commit log in each patch.)
Thanks,
Eryu
[1] https://www.spinics.net/lists/fstests/msg08903.html
Eryu Guan (2):
fstests: introduce _scratch_mount_nocheck
fstests: use _scratch_mount_nocheck where appropriate in tests
common/attr | 2 +- common/dmapi | 4 ++-- common/dump | 4 ++-- common/encrypt | 2 +- common/filestreams | 4 ++-- common/fuzzy | 4 ++-- common/log | 6 +++--- common/overlay | 2 +- common/punch | 2 +- common/quota | 4 ++-- common/rc | 38 ++++++++++++++++++++++---------------- common/xfs | 12 ++++++------ tests/btrfs/004 | 6 +++--- tests/btrfs/007 | 4 ++-- tests/btrfs/009 | 2 +- tests/btrfs/012 | 4 ++-- tests/btrfs/042 | 2 +- tests/btrfs/057 | 2 +- tests/btrfs/091 | 4 ++-- tests/btrfs/131 | 4 ++-- tests/btrfs/136 | 2 +- tests/ext4/003 | 2 +- tests/ext4/006 | 4 ++-- tests/ext4/007 | 2 +- tests/ext4/008 | 2 +- tests/ext4/011 | 4 ++-- tests/ext4/012 | 4 ++-- tests/ext4/024 | 2 +- tests/ext4/025 | 2 +- tests/ext4/305 | 2 +- tests/ext4/306 | 2 +- tests/generic/015 | 2 +- tests/generic/019 | 4 ++-- tests/generic/050 | 10 +++++----- tests/generic/052 | 4 ++-- tests/generic/053 | 2 +- tests/generic/054 | 4 ++-- tests/generic/055 | 4 ++-- tests/generic/062 | 2 +- tests/generic/064 | 2 +- tests/generic/068 | 2 +- tests/generic/069 | 2 +- tests/generic/076 | 2 +- tests/generic/077 | 2 +- tests/generic/079 | 2 +- tests/generic/082 | 4 ++-- tests/generic/083 | 2 +- tests/generic/105 | 2 +- tests/generic/117 | 2 +- tests/generic/120 | 2 +- tests/generic/169 | 2 +- tests/generic/235 | 4 ++-- tests/generic/270 | 2 +- tests/generic/294 | 2 +- tests/generic/317 | 2 +- tests/generic/318 | 2 +- tests/generic/388 | 2 +- tests/generic/390 | 2 +- tests/generic/403 | 2 +- tests/generic/466 | 2 +- tests/shared/003 | 2 +- tests/xfs/005 | 2 +- tests/xfs/009 | 2 +- tests/xfs/016 | 2 +- tests/xfs/017 | 6 +++--- tests/xfs/019 | 2 +- tests/xfs/021 | 3 +-- tests/xfs/034 | 2 +- tests/xfs/041 | 4 ++-- tests/xfs/042 | 4 ++-- tests/xfs/044 | 4 ++-- tests/xfs/045 | 4 ++-- tests/xfs/057 | 2 +- tests/xfs/067 | 2 +- tests/xfs/072 | 2 +- tests/xfs/073 | 2 +- tests/xfs/075 | 4 ++-- tests/xfs/077 | 4 ++-- tests/xfs/079 | 2 +- tests/xfs/083 | 6 +++--- tests/xfs/085 | 2 +- tests/xfs/090 | 2 +- tests/xfs/092 | 2 +- tests/xfs/094 | 2 +- tests/xfs/098 | 2 +- tests/xfs/103 | 2 +- tests/xfs/104 | 2 +- tests/xfs/111 | 2 +- tests/xfs/121 | 6 +++--- tests/xfs/130 | 2 +- tests/xfs/137 | 4 ++-- tests/xfs/141 | 2 +- tests/xfs/177 | 6 ++---- tests/xfs/181 | 2 +- tests/xfs/183 | 3 +-- tests/xfs/189 | 14 +++++++------- tests/xfs/263 | 2 +- tests/xfs/270 | 4 ++-- tests/xfs/297 | 2 +- tests/xfs/333 | 2 +- tests/xfs/338 | 2 +- tests/xfs/340 | 2 +- tests/xfs/433 | 2 +- tests/xfs/434 | 2 +- tests/xfs/435 | 2 +- tests/xfs/436 | 2 +- tests/xfs/439 | 2 +- 107 files changed, 180 insertions(+), 178 deletions(-)
Signature · 1 line
2.14.3
PATCH 1/2 fstests: introduce _scratch_mount_nocheck
_fail test by default if _scratch_mount failed and introduce _scratch_mount_nocheck for tests that need to check mount results themselves.
--- common/attr | 2 +- common/dmapi | 4 ++-- common/dump | 4 ++-- common/encrypt | 2 +- common/filestreams | 4 ++-- common/fuzzy | 4 ++-- common/log | 6 +++--- common/overlay | 2 +- common/punch | 2 +- common/quota | 4 ++-- common/rc | 38 ++++++++++++++++++++++---------------- common/xfs | 12 ++++++------ 12 files changed, 45 insertions(+), 39 deletions(-)
common/attr +1 -1
@@ -229,7 +229,7 @@ _require_noattr2() { _scratch_mkfs_xfs > /dev/null 2>&1 \ || _fail "_scratch_mkfs_xfs failed on $SCRATCH_DEV" - _scratch_mount -o noattr2 > /dev/null 2>&1 \ + _scratch_mount_nocheck -o noattr2 > /dev/null 2>&1 \ || _notrun "noattr2 mount option not supported on $SCRATCH_DEV" _scratch_unmount }
common/dmapi +2 -2
@@ -31,10 +31,10 @@ _dmapi_scratch_mount () { if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \ `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then #already got dmapi options set - _scratch_mount + _scratch_mount_nocheck dmapi_mount_result=$? else - _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT" + _scratch_mount_nocheck "-o dmapi,mtpt=$SCRATCH_MNT" dmapi_mount_result=$? fi
common/dump +2 -2
@@ -235,7 +235,7 @@ _wipe_fs() _require_scratch _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" - _scratch_mount >>$seqres.full || _fail "mount failed" + _scratch_mount >>$seqres.full } #
@@ -287,7 +287,7 @@ _stable_fs() { _saveddir=`pwd`; cd / _scratch_unmount >>$seqres.full || _fail "unmount failed" - _scratch_mount >>$seqres.full || _fail "mount failed" + _scratch_mount >>$seqres.full cd $_saveddir }
common/encrypt +1 -1
@@ -43,7 +43,7 @@ _require_scratch_encryption() # Try to mount the filesystem. If this fails then either the kernel # isn't aware of encryption, or the mkfs options were not compatible # with encryption (e.g. ext4 with block size != PAGE_SIZE). - if ! _scratch_mount &>>$seqres.full; then + if ! _scratch_mount_nocheck &>>$seqres.full; then _notrun "kernel is unaware of $FSTYP encryption feature," \ "or mkfs options are not compatible with encryption" fi
common/filestreams +2 -2
@@ -111,11 +111,11 @@ _test_streams() { if [ "$use_iflag" = "0" ]; then # mount using filestreams mount option - _scratch_mount "-o filestreams" \ + _scratch_mount_nocheck "-o filestreams" \ || _fail "filestreams mount failed" else # test will set inode flag - _scratch_mount || _fail "mount failed" + _scratch_mount fi cd $SCRATCH_MNT
common/fuzzy +2 -2
@@ -200,7 +200,7 @@ __scratch_xfs_fuzz_field_test() { # Try to catch the error with scrub echo "+ Try to catch the error" - _scratch_mount 2>&1 + _scratch_mount_nocheck 2>&1 res=$? if [ $res -eq 0 ]; then # Try an online scrub unless we're fuzzing ag 0's sb,
@@ -245,7 +245,7 @@ __scratch_xfs_fuzz_field_test() { # See if scrub finds a clean fs echo "+ Make sure error is gone (online)" - _scratch_mount 2>&1 + _scratch_mount_nocheck 2>&1 res=$? if [ $res -eq 0 ]; then # Try an online scrub unless we're fuzzing ag 0's sb,
common/log +3 -3
@@ -370,7 +370,7 @@ _create_log() { # mount the FS _full "mount" - _scratch_mount >>$seqres.full 2>&1 + _scratch_mount_nocheck >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mount failed: $MOUNT_OPTIONS" return 1
@@ -399,7 +399,7 @@ _create_log_sync() { # mount the FS _full " mount" - _scratch_mount >>$seqres.full 2>&1 + _scratch_mount_nocheck >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mount failed: $MOUNT_OPTIONS" return 1
@@ -519,7 +519,7 @@ _require_v2log() # test out mount to see if it mounts a v2 log fs export MOUNT_OPTIONS="-o logbsize=32k" - if ! _scratch_mount >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then _notrun "mount/kernel does not support v2 logs" fi
common/overlay +1 -1
@@ -167,7 +167,7 @@ _require_scratch_overlay_features() done _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o $opts || \ + _scratch_mount_nocheck -o $opts || \ _notrun "overlay options '$opts' cannot be enabled on ${SCRATCH_DEV}" for feature in ${features[*]}; do
common/punch +1 -1
@@ -131,7 +131,7 @@ _test_punch() { _dmapi_scratch_mount else # only unresvsp punch type is used, just do a normal mount - _scratch_mount || _fail "mount failed" + _scratch_mount fi cd $SCRATCH_MNT
common/quota +2 -2
@@ -119,7 +119,7 @@ _scratch_enable_pquota() [ "$FSTYP" != "ext4" ] && return tune2fs -O quota,project $SCRATCH_DEV >>$seqres.full 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support project feature on $FSTYP" _scratch_unmount }
@@ -202,7 +202,7 @@ _choose_prid() _qmount() { _scratch_unmount >/dev/null 2>&1 - _scratch_mount || _fail "qmount failed" + _scratch_mount_nocheck || _fail "qmount failed" # xfs doesn't need these setups and quotacheck even fails on xfs # redirect the output to $seqres.full for debug purpose and ignore results if [ "$FSTYP" != "xfs" ]; then
common/rc +22 -16
@@ -352,13 +352,18 @@ _supports_filetype() esac } +_scratch_mount_nocheck() +{ + if [ "$FSTYP" == "overlay" ]; then + _overlay_scratch_mount $* + return $? + fi + _mount -t $FSTYP `_scratch_mount_options $*` +} + _scratch_mount() { - if [ "$FSTYP" == "overlay" ]; then - _overlay_scratch_mount $* - return $? - fi - _mount -t $FSTYP `_scratch_mount_options $*` + _scratch_mount_nocheck $* || _fail "_scratch_mount failed" } _scratch_unmount()
@@ -397,7 +402,7 @@ _scratch_cycle_mount() opts="-o $opts" fi _scratch_unmount - _scratch_mount "$opts" + _scratch_mount_nocheck "$opts" || _fail "_scratch_cycle_mount failed" } _scratch_shutdown()
@@ -524,7 +529,7 @@ _setup_large_ext4_fs() # mount the filesystem and create 16TB - 4KB files until we consume # all the necessary space. - _scratch_mount 2>&1 >$tmp_dir/mnt.err + _scratch_mount_nocheck 2>&1 >$tmp_dir/mnt.err local status=$? if [ $status -ne 0 ]; then echo "mount failed"
@@ -1103,7 +1108,7 @@ _repair_scratch_fs() res=$? if [ "$res" -ne 0 ]; then echo "xfs_repair returns $res; replay log?" - _scratch_mount + _scratch_mount_nocheck res=$? if [ "$res" -gt 0 ]; then echo "mount returns $res; zap log?"
@@ -1872,7 +1877,7 @@ _require_scratch_ext4_crc() { _scratch_mkfs_ext4 >/dev/null 2>&1 dumpe2fs -h $SCRATCH_DEV 2> /dev/null | grep -q metadata_csum || _notrun "metadata_csum not supported by this filesystem" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support metadata_csum feature" _scratch_unmount }
@@ -1888,7 +1893,7 @@ _require_scratch_ext4_feature() $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$1" \ $SCRATCH_DEV 512m >/dev/null 2>&1 \ || _notrun "mkfs.ext4 doesn't support $1 feature" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support the ext4 feature(s): $1" _scratch_unmount }
@@ -2322,7 +2327,7 @@ _require_scratch_richacl_xfs() _scratch_mkfs_xfs_supported -m richacl=1 >/dev/null 2>&1 \ || _notrun "mkfs.xfs doesn't have richacl feature" _scratch_mkfs_xfs -m richacl=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support richacl feature on $FSTYP" _scratch_unmount }
@@ -2331,7 +2336,7 @@ _require_scratch_richacl_ext4() { _scratch_mkfs -O richacl >/dev/null 2>&1 \ || _notrun "can't mkfs $FSTYP with option -O richacl" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support richacl feature on $FSTYP" _scratch_unmount }
@@ -2993,7 +2998,7 @@ _require_scratch_shutdown() [ -x src/godown ] || _notrun "src/godown executable not found" _scratch_mkfs > /dev/null 2>&1 || _notrun "_scratch_mkfs failed on $SCRATCH_DEV" - _scratch_mount || _notrun "_scratch_mount failed on $SCRATCH_MNT" + _scratch_mount if [ $FSTYP = "overlay" ]; then if [ -z $OVL_BASE_SCRATCH_DEV ]; then
@@ -3019,7 +3024,8 @@ _require_scratch_dax() { _require_scratch _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o dax + _scratch_mount_nocheck -o dax || \ + _notrun "mount $SCRATCH_DEV with dax failed" # Check options to be sure. XFS ignores dax option # and goes on if dev underneath does not support dax. _fs_options $SCRATCH_DEV | grep -qw "dax" || \
@@ -3030,7 +3036,7 @@ _require_scratch_dax() # Does norecovery support by this fs? _require_norecovery() { - _scratch_mount -o ro,norecovery || \ + _scratch_mount_nocheck -o ro,norecovery || \ _notrun "$FSTYP does not support norecovery" _scratch_unmount }
@@ -3229,7 +3235,7 @@ _require_atime() _require_relatime() { _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o relatime || \ + _scratch_mount_nocheck -o relatime || \ _notrun "relatime not supported by the current kernel" _scratch_unmount }
common/xfs +6 -6
@@ -18,7 +18,7 @@ _setup_large_xfs_fs() file_size=$(($file_size - $SCRATCH_DEV_EMPTY_SPACE)) # mount the filesystem, create the file, unmount it - _scratch_mount 2>&1 >$tmp_dir/mnt.err + _scratch_mount_nocheck 2>&1 >$tmp_dir/mnt.err local status=$? if [ $status -ne 0 ]; then echo "mount failed"
@@ -223,7 +223,7 @@ _require_xfs_mkfs_crc() _require_xfs_crc() { _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support crc feature" _scratch_unmount }
@@ -233,7 +233,7 @@ _require_xfs_crc() _require_scratch_xfs_crc() { _scratch_mkfs_xfs >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support crc feature" xfs_info $SCRATCH_MNT | grep -q 'crc=1' || _notrun "crc feature not supported by this filesystem" _scratch_unmount
@@ -252,7 +252,7 @@ _require_xfs_mkfs_finobt() _require_xfs_finobt() { _scratch_mkfs_xfs -m crc=1,finobt=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support finobt feature" _scratch_unmount }
@@ -280,7 +280,7 @@ _require_xfs_sparse_inodes() _scratch_mkfs_xfs_supported -m crc=1 -i sparse > /dev/null 2>&1 \ || _notrun "mkfs.xfs does not support sparse inodes" _scratch_mkfs_xfs -m crc=1 -i sparse > /dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel does not support sparse inodes" _scratch_unmount }
@@ -599,7 +599,7 @@ _require_meta_uuid() _scratch_xfs_db -x -c "uuid generate" >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support meta_uuid feature" _scratch_unmount }
Signature · 1 line
2.14.3
Re: [PATCH 1/2] fstests: introduce _scratch_mount_nocheck
Quoted 219 lines · Eryu Guan
_failtest by default if_scratch_mountfailed and introduce_scratch_mount_nocheckfor tests that need to check mount results themselves.Signed-off-by Eryu Guan <[email protected]>--- common/attr | 2 +- common/dmapi | 4 ++-- common/dump | 4 ++-- common/encrypt | 2 +- common/filestreams | 4 ++-- common/fuzzy | 4 ++-- common/log | 6 +++--- common/overlay | 2 +- common/punch | 2 +- common/quota | 4 ++-- common/rc | 38 ++++++++++++++++++++++---------------- common/xfs | 12 ++++++------ 12 files changed, 45 insertions(+), 39 deletions(-)common/attr +1
-1@@ -229,7 +229,7 @@ _require_noattr2() { _scratch_mkfs_xfs > /dev/null 2>&1 \ || _fail "_scratch_mkfs_xfs failed on $SCRATCH_DEV" - _scratch_mount -o noattr2 > /dev/null 2>&1 \ + _scratch_mount_nocheck -o noattr2 > /dev/null 2>&1 \ || _notrun "noattr2 mount option not supported on $SCRATCH_DEV" _scratch_unmount }common/dmapi +2
-2@@ -31,10 +31,10 @@ _dmapi_scratch_mount () { if [ `echo "$MOUNT_OPTIONS" | grep -c dmapi` -gt 0 -o \ `echo "$MOUNT_OPTIONS" | grep -c dmi` -gt 0 ] ; then #already got dmapi options set - _scratch_mount + _scratch_mount_nocheck dmapi_mount_result=$? else - _scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT" + _scratch_mount_nocheck "-o dmapi,mtpt=$SCRATCH_MNT" dmapi_mount_result=$? ficommon/dump +2
-2@@ -235,7 +235,7 @@ _wipe_fs() _require_scratch _scratch_mkfs_xfs >>$seqres.full || _fail "mkfs failed" - _scratch_mount >>$seqres.full || _fail "mount failed" + _scratch_mount >>$seqres.full } #@@ -287,7 +287,7 @@ _stable_fs() { _saveddir=`pwd`; cd / _scratch_unmount >>$seqres.full || _fail "unmount failed" - _scratch_mount >>$seqres.full || _fail "mount failed" + _scratch_mount >>$seqres.full cd $_saveddir }common/encrypt +1
-1@@ -43,7 +43,7 @@ _require_scratch_encryption() # Try to mount the filesystem. If this fails then either the kernel # isn't aware of encryption, or the mkfs options were not compatible # with encryption (e.g. ext4 with block size != PAGE_SIZE). - if ! _scratch_mount &>>$seqres.full; then + if ! _scratch_mount_nocheck &>>$seqres.full; then _notrun "kernel is unaware of $FSTYP encryption feature," \ "or mkfs options are not compatible with encryption" ficommon/filestreams +2
-2@@ -111,11 +111,11 @@ _test_streams() { if [ "$use_iflag" = "0" ]; then # mount using filestreams mount option - _scratch_mount "-o filestreams" \ + _scratch_mount_nocheck "-o filestreams" \ || _fail "filestreams mount failed" else # test will set inode flag - _scratch_mount || _fail "mount failed" + _scratch_mount fi cd $SCRATCH_MNTcommon/fuzzy +2
-2@@ -200,7 +200,7 @@ __scratch_xfs_fuzz_field_test() { # Try to catch the error with scrub echo "+ Try to catch the error" - _scratch_mount 2>&1 + _scratch_mount_nocheck 2>&1 res=$? if [ $res -eq 0 ]; then # Try an online scrub unless we're fuzzing ag 0's sb,@@ -245,7 +245,7 @@ __scratch_xfs_fuzz_field_test() { # See if scrub finds a clean fs echo "+ Make sure error is gone (online)" - _scratch_mount 2>&1 + _scratch_mount_nocheck 2>&1 res=$? if [ $res -eq 0 ]; then # Try an online scrub unless we're fuzzing ag 0's sb,common/log +3
-3@@ -370,7 +370,7 @@ _create_log() { # mount the FS _full "mount" - _scratch_mount >>$seqres.full 2>&1 + _scratch_mount_nocheck >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mount failed: $MOUNT_OPTIONS" return 1@@ -399,7 +399,7 @@ _create_log_sync() { # mount the FS _full " mount" - _scratch_mount >>$seqres.full 2>&1 + _scratch_mount_nocheck >>$seqres.full 2>&1 if [ $? -ne 0 ] ; then _echofull "mount failed: $MOUNT_OPTIONS" return 1@@ -519,7 +519,7 @@ _require_v2log() # test out mount to see if it mounts a v2 log fs export MOUNT_OPTIONS="-o logbsize=32k" - if ! _scratch_mount >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then _notrun "mount/kernel does not support v2 logs" ficommon/overlay +1
-1@@ -167,7 +167,7 @@ _require_scratch_overlay_features() done _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o $opts || \ + _scratch_mount_nocheck -o $opts || \ _notrun "overlay options '$opts' cannot be enabled on ${SCRATCH_DEV}" for feature in ${features[*]}; docommon/punch +1
-1@@ -131,7 +131,7 @@ _test_punch() { _dmapi_scratch_mount else # only unresvsp punch type is used, just do a normal mount - _scratch_mount || _fail "mount failed" + _scratch_mount fi cd $SCRATCH_MNTcommon/quota +2
-2@@ -119,7 +119,7 @@ _scratch_enable_pquota() [ "$FSTYP" != "ext4" ] && return tune2fs -O quota,project $SCRATCH_DEV >>$seqres.full 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support project feature on $FSTYP" _scratch_unmount }@@ -202,7 +202,7 @@ _choose_prid() _qmount() { _scratch_unmount >/dev/null 2>&1 - _scratch_mount || _fail "qmount failed" + _scratch_mount_nocheck || _fail "qmount failed" # xfs doesn't need these setups and quotacheck even fails on xfs # redirect the output to $seqres.full for debug purpose and ignore results if [ "$FSTYP" != "xfs" ]; thencommon/rc +7
-0@@ -352,13 +352,18 @@ _supports_filetype() esac } +_scratch_mount_nocheck() +{ + if [ "$FSTYP" == "overlay" ]; then + _overlay_scratch_mount $* + return $? + fi + _mount -t $FSTYP `_scratch_mount_options $*`
common/rc _supports_filetype() · line 366
Quoted 10 lines
common/rc +3
-5+} + _scratch_mount() { - if [ "$FSTYP" == "overlay" ]; then - _overlay_scratch_mount $* - return $? - fi - _mount -t $FSTYP `_scratch_mount_options $*` + _scratch_mount_nocheck $* || _fail "_scratch_mount failed"
I'd change that to "mount failed"; the name of the helper function isn't very interesting.
common/rc _scratch_cycle_mount() · line 405
Quoted 9 lines
common/rc +1
-1} _scratch_unmount()@@ -397,7 +402,7 @@ _scratch_cycle_mount() opts="-o $opts" fi _scratch_unmount - _scratch_mount "$opts" + _scratch_mount_nocheck "$opts" || _fail "_scratch_cycle_mount failed"
Same here, change to "cycle mount failed" or similar.
Quoted 153 lines
common/rc +11
-10} _scratch_shutdown()@@ -524,7 +529,7 @@ _setup_large_ext4_fs() # mount the filesystem and create 16TB - 4KB files until we consume # all the necessary space. - _scratch_mount 2>&1 >$tmp_dir/mnt.err + _scratch_mount_nocheck 2>&1 >$tmp_dir/mnt.err local status=$? if [ $status -ne 0 ]; then echo "mount failed"@@ -1103,7 +1108,7 @@ _repair_scratch_fs() res=$? if [ "$res" -ne 0 ]; then echo "xfs_repair returns $res; replay log?" - _scratch_mount + _scratch_mount_nocheck res=$? if [ "$res" -gt 0 ]; then echo "mount returns $res; zap log?"@@ -1872,7 +1877,7 @@ _require_scratch_ext4_crc() { _scratch_mkfs_ext4 >/dev/null 2>&1 dumpe2fs -h $SCRATCH_DEV 2> /dev/null | grep -q metadata_csum || _notrun "metadata_csum not supported by this filesystem" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support metadata_csum feature" _scratch_unmount }@@ -1888,7 +1893,7 @@ _require_scratch_ext4_feature() $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$1" \ $SCRATCH_DEV 512m >/dev/null 2>&1 \ || _notrun "mkfs.ext4 doesn't support $1 feature" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support the ext4 feature(s): $1" _scratch_unmount }@@ -2322,7 +2327,7 @@ _require_scratch_richacl_xfs() _scratch_mkfs_xfs_supported -m richacl=1 >/dev/null 2>&1 \ || _notrun "mkfs.xfs doesn't have richacl feature" _scratch_mkfs_xfs -m richacl=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support richacl feature on $FSTYP" _scratch_unmount }@@ -2331,7 +2336,7 @@ _require_scratch_richacl_ext4() { _scratch_mkfs -O richacl >/dev/null 2>&1 \ || _notrun "can't mkfs $FSTYP with option -O richacl" - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel doesn't support richacl feature on $FSTYP" _scratch_unmount }@@ -2993,7 +2998,7 @@ _require_scratch_shutdown() [ -x src/godown ] || _notrun "src/godown executable not found" _scratch_mkfs > /dev/null 2>&1 || _notrun "_scratch_mkfs failed on $SCRATCH_DEV" - _scratch_mount || _notrun "_scratch_mount failed on $SCRATCH_MNT" + _scratch_mount if [ $FSTYP = "overlay" ]; then if [ -z $OVL_BASE_SCRATCH_DEV ]; then@@ -3019,7 +3024,8 @@ _require_scratch_dax() { _require_scratch _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o dax + _scratch_mount_nocheck -o dax || \ + _notrun "mount $SCRATCH_DEV with dax failed" # Check options to be sure. XFS ignores dax option # and goes on if dev underneath does not support dax. _fs_options $SCRATCH_DEV | grep -qw "dax" || \@@ -3030,7 +3036,7 @@ _require_scratch_dax() # Does norecovery support by this fs? _require_norecovery() { - _scratch_mount -o ro,norecovery || \ + _scratch_mount_nocheck -o ro,norecovery || \ _notrun "$FSTYP does not support norecovery" _scratch_unmount }@@ -3229,7 +3235,7 @@ _require_atime() _require_relatime() { _scratch_mkfs > /dev/null 2>&1 - _scratch_mount -o relatime || \ + _scratch_mount_nocheck -o relatime || \ _notrun "relatime not supported by the current kernel" _scratch_unmount }common/xfs +6
-7@@ -18,7 +18,7 @@ _setup_large_xfs_fs() file_size=$(($file_size - $SCRATCH_DEV_EMPTY_SPACE)) # mount the filesystem, create the file, unmount it - _scratch_mount 2>&1 >$tmp_dir/mnt.err + _scratch_mount_nocheck 2>&1 >$tmp_dir/mnt.err local status=$? if [ $status -ne 0 ]; then echo "mount failed"@@ -223,7 +223,7 @@ _require_xfs_mkfs_crc() _require_xfs_crc() { _scratch_mkfs_xfs -m crc=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support crc feature" _scratch_unmount }@@ -233,7 +233,7 @@ _require_xfs_crc() _require_scratch_xfs_crc() { _scratch_mkfs_xfs >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support crc feature" xfs_info $SCRATCH_MNT | grep -q 'crc=1' || _notrun "crc feature not supported by this filesystem" _scratch_unmount@@ -252,7 +252,7 @@ _require_xfs_mkfs_finobt() _require_xfs_finobt() { _scratch_mkfs_xfs -m crc=1,finobt=1 >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support finobt feature" _scratch_unmount }@@ -280,7 +280,7 @@ _require_xfs_sparse_inodes() _scratch_mkfs_xfs_supported -m crc=1 -i sparse > /dev/null 2>&1 \ || _notrun "mkfs.xfs does not support sparse inodes" _scratch_mkfs_xfs -m crc=1 -i sparse > /dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "kernel does not support sparse inodes" _scratch_unmount }@@ -599,7 +599,7 @@ _require_meta_uuid() _scratch_xfs_db -x -c "uuid generate" >/dev/null 2>&1 - _scratch_mount >/dev/null 2>&1 \ + _scratch_mount_nocheck >/dev/null 2>&1 \ || _notrun "Kernel doesn't support meta_uuid feature" _scratch_unmount } --
Quoted 1 line
2.14.3
Thanks,
Andreas
Re: [PATCH 1/2] fstests: introduce _scratch_mount_nocheck
Quoted 7 lines · Andreas Gruenbacher
Quoted 6 lines · Eryu Guan
_failtest by default if_scratch_mountfailed and introduce_scratch_mount_nocheckfor tests that need to check mount results themselves.Signed-off-by Eryu Guan <[email protected]>---
[snip]
Quoted 18 lines
Quoted 18 lines
common/rc +9
-1@@ -352,13 +352,18 @@ _supports_filetype() esac } +_scratch_mount_nocheck() +{ + if [ "$FSTYP" == "overlay" ]; then + _overlay_scratch_mount $* + return $? + fi + _mount -t $FSTYP `_scratch_mount_options $*` +} + _scratch_mount() { - if [ "$FSTYP" == "overlay" ]; then
Quoted 8 lines
common/rc _supports_filetype() · line 366
Quoted 5 lines
common/rc +1
-4- _overlay_scratch_mount $* - return $? - fi - _mount -t $FSTYP `_scratch_mount_options $*` + _scratch_mount_nocheck $* || _fail "_scratch_mount failed"I'd change that to "mount failed"; the name of the helper function isn't very interesting.
I think it'd be easier to know which mount fails, but sure, I have no strong preference on it.
Quoted 12 lines
common/rc _scratch_cycle_mount() · line 405
Quoted 10 lines
common/rc +1
-1} _scratch_unmount()@@ -397,7 +402,7 @@ _scratch_cycle_mount() opts="-o $opts" fi _scratch_unmount - _scratch_mount "$opts" + _scratch_mount_nocheck "$opts" || _fail "_scratch_cycle_mount failed"Same here, change to "cycle mount failed" or similar.
OK.
And thanks for the testing feedback!
Eryu
PATCH 2/2 fstests: use _scratch_mount_nocheck where appropriate in tests
In reply to Eryu GuanAlso remove redundant status checks of _scratch_mount.
--- tests/btrfs/004 | 6 +++--- tests/btrfs/007 | 4 ++-- tests/btrfs/009 | 2 +- tests/btrfs/012 | 4 ++-- tests/btrfs/042 | 2 +- tests/btrfs/057 | 2 +- tests/btrfs/091 | 4 ++-- tests/btrfs/131 | 4 ++-- tests/btrfs/136 | 2 +- tests/ext4/003 | 2 +- tests/ext4/006 | 4 ++-- tests/ext4/007 | 2 +- tests/ext4/008 | 2 +- tests/ext4/011 | 4 ++-- tests/ext4/012 | 4 ++-- tests/ext4/024 | 2 +- tests/ext4/025 | 2 +- tests/ext4/305 | 2 +- tests/ext4/306 | 2 +- tests/generic/015 | 2 +- tests/generic/019 | 4 ++-- tests/generic/050 | 10 +++++----- tests/generic/052 | 4 ++-- tests/generic/053 | 2 +- tests/generic/054 | 4 ++-- tests/generic/055 | 4 ++-- tests/generic/062 | 2 +- tests/generic/064 | 2 +- tests/generic/068 | 2 +- tests/generic/069 | 2 +- tests/generic/076 | 2 +- tests/generic/077 | 2 +- tests/generic/079 | 2 +- tests/generic/082 | 4 ++-- tests/generic/083 | 2 +- tests/generic/105 | 2 +- tests/generic/117 | 2 +- tests/generic/120 | 2 +- tests/generic/169 | 2 +- tests/generic/235 | 4 ++-- tests/generic/270 | 2 +- tests/generic/294 | 2 +- tests/generic/317 | 2 +- tests/generic/318 | 2 +- tests/generic/388 | 2 +- tests/generic/390 | 2 +- tests/generic/403 | 2 +- tests/generic/466 | 2 +- tests/shared/003 | 2 +- tests/xfs/005 | 2 +- tests/xfs/009 | 2 +- tests/xfs/016 | 2 +- tests/xfs/017 | 6 +++--- tests/xfs/019 | 2 +- tests/xfs/021 | 3 +-- tests/xfs/034 | 2 +- tests/xfs/041 | 4 ++-- tests/xfs/042 | 4 ++-- tests/xfs/044 | 4 ++-- tests/xfs/045 | 4 ++-- tests/xfs/057 | 2 +- tests/xfs/067 | 2 +- tests/xfs/072 | 2 +- tests/xfs/073 | 2 +- tests/xfs/075 | 4 ++-- tests/xfs/077 | 4 ++-- tests/xfs/079 | 2 +- tests/xfs/083 | 6 +++--- tests/xfs/085 | 2 +- tests/xfs/090 | 2 +- tests/xfs/092 | 2 +- tests/xfs/094 | 2 +- tests/xfs/098 | 2 +- tests/xfs/103 | 2 +- tests/xfs/104 | 2 +- tests/xfs/111 | 2 +- tests/xfs/121 | 6 +++--- tests/xfs/130 | 2 +- tests/xfs/137 | 4 ++-- tests/xfs/141 | 2 +- tests/xfs/177 | 6 ++---- tests/xfs/181 | 2 +- tests/xfs/183 | 3 +-- tests/xfs/189 | 14 +++++++------- tests/xfs/263 | 2 +- tests/xfs/270 | 4 ++-- tests/xfs/297 | 2 +- tests/xfs/333 | 2 +- tests/xfs/338 | 2 +- tests/xfs/340 | 2 +- tests/xfs/433 | 2 +- tests/xfs/434 | 2 +- tests/xfs/435 | 2 +- tests/xfs/436 | 2 +- tests/xfs/439 | 2 +- 95 files changed, 135 insertions(+), 139 deletions(-)
tests/btrfs/004 +3 -3
@@ -185,7 +185,7 @@ workout() echo "" >>$seqres.full _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \ || _fail "size=$fsz mkfs failed" - run_check _scratch_mount + _scratch_mount # -w ensures that the only ops are ones which cause write I/O run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p $procs -n 2000 \ $FSSTRESS_AVOID
@@ -194,7 +194,7 @@ workout() $SCRATCH_MNT/$snap_name run_check _scratch_unmount >/dev/null 2>&1 - run_check _scratch_mount "-o compress=lzo" + _scratch_mount "-o compress=lzo" # make some noise but ensure we're not touching existing data # extents.
@@ -208,7 +208,7 @@ workout() run_check $FSSTRESS_PROG -d $clean_dir -w -p $procs -n 2000 \ $FSSTRESS_AVOID run_check _scratch_unmount >/dev/null 2>&1 - run_check _scratch_mount "-o atime" + _scratch_mount "-o atime" if [ $do_bg_noise -ne 0 ]; then # make background noise while backrefs are being walked
tests/btrfs/007 +2 -2
@@ -65,7 +65,7 @@ workout() echo "" >>$seqres.full _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \ || _fail "size=$fsz mkfs failed" - run_check _scratch_mount "-o noatime" + _scratch_mount "-o noatime" run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n $ops $FSSTRESS_AVOID -x \ "$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/base"
@@ -91,7 +91,7 @@ workout() echo "" >>$seqres.full _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \ || _fail "size=$fsz mkfs failed" - run_check _scratch_mount "-o noatime" + _scratch_mount "-o noatime" _run_btrfs_util_prog receive $SCRATCH_MNT < $tmp/base.snap run_check $FSSUM_PROG -r $tmp/base.fssum $SCRATCH_MNT/base
tests/btrfs/009 +1 -1
@@ -59,7 +59,7 @@ $BTRFS_UTIL_PROG subvolume set-default $subvolid $SCRATCH_MNT >> $seqres.full 2> || _fail "couldn't set default" $BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/newvol >> $seqres.full 2>&1 _scratch_unmount -_scratch_mount || _fail "mount should have succeeded" +_scratch_mount_nocheck || _fail "mount should have succeeded" echo "Silence is golden" status=0 ; exit
tests/btrfs/012 +2 -2
@@ -74,7 +74,7 @@ _scratch_unmount # Convert it to btrfs, mount it, verify the data $BTRFS_CONVERT_PROG $SCRATCH_DEV >> $seqres.full 2>&1 || \ _fail "btrfs-convert failed" -_scratch_mount || _fail "Could not mount new btrfs fs" +_scratch_mount_nocheck || _fail "Could not mount new btrfs fs" # (Ignore the symlinks which may be broken/nonexistent) diff -r /lib/modules/`uname -r`/ $SCRATCH_MNT/`uname -r`/ 2>&1 | grep -vw "source\|build"
@@ -114,7 +114,7 @@ _scratch_unmount # Convert it to btrfs, mount it and delete "ext2_saved" $BTRFS_CONVERT_PROG $SCRATCH_DEV >> $seqres.full 2>&1 || \ _fail "btrfs-convert failed" -_scratch_mount || _fail "Could not mount new btrfs fs" +_scratch_mount_nocheck || _fail "Could not mount new btrfs fs" $BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/ext2_saved >> $seqres.full 2>&1 || _fail "failed to delete ext2_saved subvolume" _scratch_unmount
tests/btrfs/042 +1 -1
@@ -48,7 +48,7 @@ _require_btrfs_qgroup_report rm -f $seqres.full run_check _scratch_mkfs -run_check _scratch_mount +_scratch_mount LIMIT_SIZE=$((10 * 1024 * 1024))
tests/btrfs/057 +1 -1
@@ -54,7 +54,7 @@ run_check _scratch_mkfs "-b 1g --nodesize 4096" # inode cache is saved in the FS tree itself for every # individual FS tree,that affects the sizes reported by qgroup show # so we need to explicitly turn it off to get consistent values. -run_check _scratch_mount "-o noinode_cache" +_scratch_mount "-o noinode_cache" # -w ensures that the only ops are ones which cause write I/O run_check $FSSTRESS_PROG -d $SCRATCH_MNT -w -p 5 -n 1000 \
tests/btrfs/091 +2 -2
@@ -61,12 +61,12 @@ run_check _scratch_mkfs "--nodesize $NODESIZE" # result. # discard error output since we will check return value manually. # also disable all compression, or output will mismatch with golden output -_scratch_mount "-o noinode_cache,compress=no,compress-force=no" 2> /dev/null +_scratch_mount_nocheck "-o noinode_cache,compress=no,compress-force=no" 2> /dev/null # Check for old kernel which doesn't support 'noinode_cache' mount option if [ $? -ne 0 ]; then support_noinode_cache="no" - run_check _scratch_mount + _scratch_mount fi _run_btrfs_util_prog subvolume create $SCRATCH_MNT/subv1
tests/btrfs/131 +2 -2
@@ -114,8 +114,8 @@ _scratch_unmount mkfs_v2 echo "Trying to mount without free space tree" -_scratch_mount -o nospace_cache >/dev/null 2>&1 || echo "mount failed" -_scratch_mount -o space_cache=v1 >/dev/null 2>&1 || echo "mount failed" +_scratch_mount_nocheck -o nospace_cache >/dev/null 2>&1 || echo "mount failed" +_scratch_mount_nocheck -o space_cache=v1 >/dev/null 2>&1 || echo "mount failed" mkfs_v2 echo "Mounting existing free space tree"
tests/btrfs/136 +1 -1
@@ -102,7 +102,7 @@ _scratch_unmount # Convert non-extent & extent data to btrfs, mount it, verify the data $BTRFS_CONVERT_PROG $SCRATCH_DEV >> $seqres.full 2>&1 || \ _fail "btrfs-convert failed" -_scratch_mount || _fail "Could not mount new btrfs fs" +_scratch_mount_nocheck || _fail "Could not mount new btrfs fs" # Compute md5 for converted files. find "$SCRATCH_MNT/ext3_ext4_data" -type f -fprint "$BTRFS_MD5SUM"
tests/ext4/003 +1 -1
@@ -44,7 +44,7 @@ rm -f $seqres.full $MKFS_EXT4_PROG -F -O bigalloc -C 65536 -g 256 $SCRATCH_DEV 512m \ >> $seqres.full 2>&1 -_scratch_mount || _fail "couldn't mount fs" +_scratch_mount $XFS_IO_PROG -f -c "pwrite 0 256m -b 1M" $SCRATCH_MNT/testfile 2>&1 | \ _filter_xfs_io
tests/ext4/006 +2 -2
@@ -112,7 +112,7 @@ echo "++ corrupt image" >> $seqres.full e2fuzz ${FUZZ_ARGS} ${SCRATCH_DEV} >> $seqres.full 2>&1 echo "++ mount image" >> $seqres.full -_scratch_mount >> $seqres.full 2>&1 +_scratch_mount_nocheck >> $seqres.full 2>&1 echo "++ test scratch" >> $seqres.full _scratch_fuzz_test >> $seqres.full 2>&1
@@ -134,7 +134,7 @@ _check_scratch_fs >> $seqres.full 2>&1 ROUND2_LOG="${tmp}-round2-${fsck_pass}.log" echo "++ mount image (2)" >> $ROUND2_LOG -_scratch_mount >> $ROUND2_LOG 2>&1 +_scratch_mount_nocheck >> $ROUND2_LOG 2>&1 echo "++ chattr -R -i" >> $ROUND2_LOG $CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG
tests/ext4/007 +1 -1
@@ -89,7 +89,7 @@ dumpe2fs -g "${SCRATCH_DEV}" 2>/dev/null | awk -F ':' '{if ($1 == 0) {print $3}} done echo "+ mount image" -_scratch_mount 2> /dev/null && _fail "mount should not succeed" +_scratch_mount_nocheck 2> /dev/null && _fail "mount should not succeed" echo "+ repair fs" # Have to specify backup sb and blocksize here so we don't pick up superblocks
tests/ext4/008 +1 -1
@@ -85,7 +85,7 @@ dumpe2fs -g "${SCRATCH_DEV}" 2>/dev/null | awk -F ':' '{if (int($4) != -1) {prin done echo "+ mount image" -_scratch_mount 2> /dev/null && _fail "mount should not succeed" +_scratch_mount_nocheck 2> /dev/null && _fail "mount should not succeed" echo "+ repair fs" e2fsck -fy "${SCRATCH_DEV}" >> $seqres.full 2>&1
tests/ext4/011 +2 -2
@@ -73,13 +73,13 @@ blk="$(dumpe2fs "${SCRATCH_DEV}" 2> /dev/null | grep 'MMP block number' | sed -e $XFS_IO_PROG -f -c "pwrite -S 0x62 $((blk * blksz + 16)) 8" "${SCRATCH_DEV}" >> $seqres.full echo "+ mount image" -_scratch_mount 2> /dev/null && _fail "mount should fail due to bad MMP" +_scratch_mount_nocheck 2> /dev/null && _fail "mount should fail due to bad MMP" echo "+ repair fs" e2fsck -fy "${SCRATCH_DEV}" >> $seqres.full 2>&1 echo "+ mount image (2)" -_scratch_mount || _fail "mount should not fail; MMP has been fixed" +_scratch_mount_nocheck || _fail "mount should not fail; MMP has been fixed" echo "+ check fs (2)" e2fsck -fn "${SCRATCH_DEV}" >> $seqres.full 2>&1 || _fail "fsck should not fail"
tests/ext4/012 +2 -2
@@ -72,13 +72,13 @@ echo "+ corrupt image" debugfs -w -R 'zap -f <8> 0' "${SCRATCH_DEV}" 2> /dev/null echo "+ mount image" -_scratch_mount 2> /dev/null && _fail "mount should fail due to bad journal" +_scratch_mount_nocheck 2> /dev/null && _fail "mount should fail due to bad journal" echo "+ repair fs" e2fsck -fy "${SCRATCH_DEV}" >> $seqres.full 2>&1 echo "+ mount image (2)" -_scratch_mount || _fail "mount should not fail; journal has been fixed" +_scratch_mount_nocheck || _fail "mount should not fail; journal has been fixed" echo "+ check fs (2)" e2fsck -fn "${SCRATCH_DEV}" >> $seqres.full 2>&1 || _fail "fsck should not fail"
tests/ext4/024 +1 -1
@@ -79,7 +79,7 @@ _scratch_unmount debugfs -w -R "set_super_value s_last_orphan $inum" $SCRATCH_DEV &>>$seqres.full # Try to mount the filesystem. This would hit a BUG() in fs/ext4/inode.c. -_scratch_mount +_scratch_mount_nocheck # success, all done echo "Didn't crash!"
tests/ext4/025 +1 -1
@@ -58,7 +58,7 @@ _scratch_mkfs "-O bigalloc,meta_bg,^resize_inode" >> $seqres.full 2>&1 $DEBUGFS_PROG -w -R "ssv first_meta_bg 842150400" $SCRATCH_DEV >> $seqres.full 2>&1 echo "Try to mount a modified ext4 fs" -_scratch_mount >> $seqres.full 2>&1 || echo "Fail to mount ext4 fs expectedly" +_scratch_mount_nocheck >> $seqres.full 2>&1 || echo "Fail to mount ext4 fs expectedly" # success, all done status=0
tests/ext4/305 +1 -1
@@ -61,7 +61,7 @@ PIDS=$! # 30 loops is enough to crash a buggy kernel i=0 while [ $i -lt 30 ]; do - _scratch_mount + _scratch_mount_nocheck _scratch_unmount let i=i+1 done
tests/ext4/306 +1 -1
@@ -53,7 +53,7 @@ if grep -q 64bit /etc/mke2fs.conf ; then features="^extents,^64bit" fi $MKFS_EXT4_PROG -F -O "$features" $SCRATCH_DEV 512m >> $seqres.full 2>&1 -_scratch_mount || _fail "couldn't mount fs" +_scratch_mount # Create a small non-extent-based file echo "Create 1m testfile1"
tests/generic/015 +1 -1
@@ -59,7 +59,7 @@ _require_no_large_scratch_dev # tolerance of 1% _scratch_mkfs_sized `expr 101 \* 1024 \* 1024` >/dev/null 2>&1 \ || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount out=$SCRATCH_MNT/fillup.$$ rm -f $seqres.full
tests/generic/019 +2 -2
@@ -166,7 +166,7 @@ _workout() # In order to check that filesystem is able to recover journal on mount(2) # perform mount/umount, after that all errors should be fixed - run_check _scratch_mount + _scratch_mount run_check _scratch_unmount }
@@ -174,7 +174,7 @@ _workout() rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount allow_fail_make_request _workout status=$?
tests/generic/050 +5 -5
@@ -61,7 +61,7 @@ blockdev --setro $SCRATCH_DEV # Mount it, and make sure we can't write to it, and we can unmount it again # echo "mounting read-only block device:" -_scratch_mount 2>&1 | _filter_ro_mount +_scratch_mount_nocheck 2>&1 | _filter_ro_mount echo "touching file on read-only filesystem (should fail)" touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
@@ -77,7 +77,7 @@ echo "setting device read-write" blockdev --setrw $SCRATCH_DEV echo "mounting read-write block device:" -_scratch_mount 2>&1 | _filter_scratch +_scratch_mount_nocheck 2>&1 | _filter_scratch echo "touch files" touch $SCRATCH_MNT/{0,1,2,3,4,5,6,7,8,9}{0,1,2,3,4,5,6,7,8,9}
@@ -96,7 +96,7 @@ blockdev --setro $SCRATCH_DEV # -o norecovery is used. # echo "mounting filesystem that needs recovery on a read-only device:" -_scratch_mount 2>&1 | _filter_ro_mount +_scratch_mount_nocheck 2>&1 | _filter_ro_mount echo "unmounting read-only filesystem" _scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot
@@ -107,7 +107,7 @@ _scratch_unmount 2>&1 | _filter_scratch | _filter_ending_dot # data recovery hack. # echo "mounting filesystem with -o norecovery on a read-only device:" -_scratch_mount -o norecovery 2>&1 | _filter_ro_mount +_scratch_mount_nocheck -o norecovery 2>&1 | _filter_ro_mount echo "unmounting read-only filesystem" _scratch_unmount 2>&1 | _filter_scratch
@@ -120,7 +120,7 @@ blockdev --setrw $SCRATCH_DEV # the underlying device is not write protected. # echo "mounting filesystem that needs recovery with -o ro:" -_scratch_mount -o ro 2>&1 | _filter_scratch +_scratch_mount_nocheck -o ro 2>&1 | _filter_scratch # success, all done echo "*** done"
tests/generic/052 +2 -2
@@ -56,7 +56,7 @@ _scratch_mkfs >>$seqres.full 2>&1 \ _require_metadata_journaling $SCRATCH_DEV echo "mount" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" echo "touch files"
@@ -79,7 +79,7 @@ if false; then fi echo "mount with replay" -_scratch_mount $mnt >>$seqres.full 2>&1 \ +_scratch_mount_nocheck $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "ls SCRATCH_MNT"
tests/generic/053 +1 -1
@@ -48,7 +48,7 @@ test=$SCRATCH_MNT/test # make filesystem on scratch using the defaults _do 'make filesystem on $SCRATCH_DEV' '_scratch_mkfs' -_do 'mount filesytem' '_scratch_mount' +_do 'mount filesytem' '_scratch_mount_nocheck' # create test files and set acls acls="
tests/generic/054 +2 -2
@@ -83,7 +83,7 @@ for s in sync nosync ; do # mount the FS _echofull "mount" - if ! _scratch_mount >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi
@@ -118,7 +118,7 @@ for s in sync nosync ; do _print_logstate _echofull "mount with replay" - _scratch_mount >>$seqres.full 2>&1 \ + _scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery
tests/generic/055 +2 -2
@@ -105,7 +105,7 @@ do # mount the FS _echofull "mount" - if ! _scratch_mount $QUOTA_OPTION >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck $QUOTA_OPTION >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi
@@ -131,7 +131,7 @@ do _scratch_xfs_logprint -n >>$seqres.full 2>&1 _echofull "mount with replay" - _scratch_mount $QUOTA_OPTION >>$seqres.full 2>&1 \ + _scratch_mount_nocheck $QUOTA_OPTION >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # check on what FS looks like after log recovery
tests/generic/062 +1 -1
@@ -80,7 +80,7 @@ rm -f $tmp.backup1 $tmp.backup2 $seqres.full # real QA test starts here _scratch_mkfs > /dev/null 2>&1 || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount _create_test_bed # In kernels before 3.0, getxattr() fails with EPERM for an attribute which
tests/generic/064 +1 -1
@@ -50,7 +50,7 @@ _require_xfs_io_command "fcollapse" rm -f $seqres.full _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount src=$SCRATCH_MNT/testfile dest=$SCRATCH_MNT/testfile.dest
tests/generic/068 +1 -1
@@ -62,7 +62,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" touch $tmp.running
tests/generic/069 +1 -1
@@ -48,7 +48,7 @@ echo "*** mkfs" _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed" echo "*** mount FS" -_scratch_mount >/dev/null || _fail "mount failed" +_scratch_mount cd $SCRATCH_MNT
tests/generic/076 +1 -1
@@ -66,7 +66,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" echo "*** test concurrent block/fs access"
tests/generic/077 +1 -1
@@ -68,7 +68,7 @@ echo "" >>$seqres.full SIZE=`expr 50 \* 1024 \* 1024` _scratch_mkfs_sized $SIZE >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" mkdir $SCRATCH_MNT/subdir
tests/generic/079 +1 -1
@@ -53,7 +53,7 @@ _require_scratch # real QA test starts here _scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount echo "*** starting up" $timmutable -c $SCRATCH_MNT/$seq >$tmp.out 2>&1
tests/generic/082 +2 -2
@@ -68,10 +68,10 @@ quotaon $SCRATCH_MNT >>$seqres.full 2>&1 # quota, but currently xfs doesn't fail in this case, the unknown option is # just ignored, but quota is still on. This may change in future, let's # re-consider the case then. -_scratch_mount "-o remount,ro,nosuchopt" >>$seqres.full 2>&1 +_scratch_mount_nocheck "-o remount,ro,nosuchopt" >>$seqres.full 2>&1 quotaon -p $SCRATCH_MNT | _filter_scratch | filter_project_quota_line # second remount should succeed, no oops or hang expected -_scratch_mount "-o remount,ro" || _fail "second remount,ro failed" +_scratch_mount_nocheck "-o remount,ro" || _fail "second remount,ro failed" # success, all done status=0
tests/generic/083 +1 -1
@@ -78,7 +78,7 @@ workout() _scratch_mkfs_sized $fsz >>$seqres.full 2>&1 \ || _fail "size=$fsz mkfs failed" fi - _scratch_mount >>$seqres.full 2>&1 \ + _scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" # -w ensures that the only ops are ones which cause write I/O
tests/generic/105 +1 -1
@@ -62,7 +62,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" cd $SCRATCH_MNT
tests/generic/117 +1 -1
@@ -87,7 +87,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" mkdir -p $SCRATCH_MNT/fsstress
tests/generic/120 +1 -1
@@ -60,7 +60,7 @@ _compare_access_times() } -if ! _scratch_mount "-o noatime" >$tmp.out 2>&1 +if ! _scratch_mount_nocheck "-o noatime" >$tmp.out 2>&1 then cat $tmp.out echo "!!! mount failed"
tests/generic/169 +1 -1
@@ -60,7 +60,7 @@ _require_scratch _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" echo "# creating new file for io"
tests/generic/235 +2 -2
@@ -69,9 +69,9 @@ do_repquota # https://bugzilla.redhat.com/show_bug.cgi?id=563267 # # then you need a more recent mount binary. -_scratch_mount "-o remount,ro" 2>&1 | tee -a $seqres.full | _filter_scratch +_scratch_mount_nocheck "-o remount,ro" 2>&1 | tee -a $seqres.full | _filter_scratch touch $SCRATCH_MNT/failed 2>&1 | tee -a $seqres.full | _filter_scratch -_scratch_mount "-o remount,rw" 2>&1 | tee -a $seqres.full | _filter_scratch +_scratch_mount_nocheck "-o remount,rw" 2>&1 | tee -a $seqres.full | _filter_scratch $XFS_IO_PROG -c 'pwrite 0 8k' -c 'fsync' \ $SCRATCH_MNT/testfile >>$seqres.full 2>&1
tests/generic/270 +1 -1
@@ -83,7 +83,7 @@ _require_command "$KILLALL_PROG" killall rm -f $seqres.full _scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1 -_scratch_mount "-o usrquota,grpquota" || _fail "mount failed" +_scratch_mount "-o usrquota,grpquota" chmod 777 $SCRATCH_MNT quotacheck -u -g $SCRATCH_MNT 2>/dev/null quotaon -u -g $SCRATCH_MNT 2>/dev/null
tests/generic/294 +1 -1
@@ -67,7 +67,7 @@ rm -rf $THIS_TEST_DIR mkdir $THIS_TEST_DIR || _fail "Could not create dir for test" _create_files 2>&1 | _filter_scratch -_scratch_mount -o remount,ro || _fail "Could not remount scratch readonly" +_scratch_mount_nocheck -o remount,ro || _fail "Could not remount scratch readonly" _create_files 2>&1 | _filter_scratch # success, all done
tests/generic/317 +1 -1
@@ -83,7 +83,7 @@ _scratch_unmount >/dev/null 2>&1 echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 || _fail "mount failed" +_scratch_mount_nocheck >>$seqres.full 2>&1 || _fail "mount failed" chmod 777 $SCRATCH_MNT # create $file as "root" in userns, which is $qa_user in parent namespace
tests/generic/318 +1 -1
@@ -93,7 +93,7 @@ _scratch_unmount >/dev/null 2>&1 echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 || _fail "mount failed" +_scratch_mount_nocheck >>$seqres.full 2>&1 || _fail "mount failed" touch $file chown $acl1.$acl1 $file
tests/generic/388 +1 -1
@@ -64,7 +64,7 @@ echo "Silence is golden." _scratch_mkfs >> $seqres.full 2>&1 _require_metadata_journaling $SCRATCH_DEV -_scratch_mount || _fail "mount failed" +_scratch_mount for i in $(seq 1 $((50 * TIME_FACTOR)) ); do ($FSSTRESS_PROG $FSSTRESS_AVOID -d $SCRATCH_MNT -n 999999 -p 4 >> $seqres.full &) \
tests/generic/390 +1 -1
@@ -58,7 +58,7 @@ _require_test_program "feature" _scratch_mkfs >>$seqres.full 2>&1 # We don't want to freeze/unfreeze root fs if mount scratch dev failed -_scratch_mount >>$seqres.full 2>&1 || _fail "mount failed" +_scratch_mount_nocheck >>$seqres.full 2>&1 || _fail "mount failed" num_cpus=`$here/src/feature -o`
tests/generic/403 +1 -1
@@ -54,7 +54,7 @@ _require_scratch _require_attrs _scratch_mkfs > $seqres.full 2>&1 || _fail "mkfs" -_scratch_mount || _fail "mount" +_scratch_mount # create xattr small enough for local format on XFS touch $SCRATCH_MNT/file
tests/generic/466 +1 -1
@@ -60,7 +60,7 @@ for blocksize in 512 1024 2048 4096 8192 16384 32768 65536; do # Try to format and mount with the given blocksize. If they don't # succeed, move on to the next block size. if ! _scratch_mkfs_sized $devsize $blocksize >> $seqres.full 2>&1 || - ! _scratch_mount >> $seqres.full 2>&1 || + ! _scratch_mount_nocheck >> $seqres.full 2>&1 || test "$(stat -f -c '%S' $SCRATCH_MNT)" -ne "$blocksize"; then echo "+++ Format and mount failed" >> $seqres.full continue
tests/shared/003 +1 -1
@@ -63,7 +63,7 @@ debugfs -w -R "feature +needs_recovery" $SCRATCH_DEV \ >>$seqres.full 2>&1 # mount with noload option -_scratch_mount "-o noload" >>$seqres.full 2>&1 +_scratch_mount_nocheck "-o noload" >>$seqres.full 2>&1 # success, all done status=0
tests/xfs/005 +1 -1
@@ -59,7 +59,7 @@ _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed" $XFS_IO_PROG -c "pwrite 224 4" -c fsync $SCRATCH_DEV | _filter_xfs_io # should FAIL, the crc is bad; golden output contains mount failure -_scratch_mount 2>&1 | _filter_error_mount +_scratch_mount_nocheck 2>&1 | _filter_error_mount # success, all done status=0
tests/xfs/009 +1 -1
@@ -58,7 +58,7 @@ _init() fi echo "*** mount" - if ! _scratch_mount + if ! _scratch_mount_nocheck then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/016 +1 -1
@@ -91,7 +91,7 @@ _log_traffic() out=$SCRATCH_MNT/$$.tmp echo " *** mount" - if ! _scratch_mount + if ! _scratch_mount_nocheck then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/017 +3 -3
@@ -59,7 +59,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" echo "*** test"
@@ -70,7 +70,7 @@ do FSSTRESS_ARGS=`_scale_fsstress_args -d $SCRATCH_MNT -n 1000 $FSSTRESS_AVOID` $FSSTRESS_PROG $FSSTRESS_ARGS >>$seqres.full - _scratch_mount -o remount,ro \ + _scratch_mount_nocheck -o remount,ro \ || _fail "remount ro failed" echo "" >>$seqres.full
@@ -84,7 +84,7 @@ do echo "" >>$seqres.full _scratch_xfs_check >>$seqres.full 2>&1 \ || _fail "xfs_check failed" - _scratch_mount -o remount,rw \ + _scratch_mount_nocheck -o remount,rw \ || _fail "remount rw failed" done
tests/xfs/019 +1 -1
@@ -122,7 +122,7 @@ _verify_fs() echo "*** mount FS" _full " mount" - _scratch_mount >>$seqfull 2>&1 \ + _scratch_mount_nocheck >>$seqfull 2>&1 \ || _fail "mount failed" echo "*** verify FS"
tests/xfs/021 +1 -2
@@ -87,8 +87,7 @@ _scratch_mkfs_xfs >/dev/null \ || _fail "mkfs failed" echo "*** mount FS" -_scratch_mount >/dev/null \ - || _fail "mount failed" +_scratch_mount testfile=$SCRATCH_MNT/testfile echo "*** make test file 1"
tests/xfs/034 +1 -1
@@ -57,7 +57,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed" echo "*** test"
tests/xfs/041 +2 -2
@@ -67,7 +67,7 @@ _scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs fai bsize=`_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 | _filter_mkfs 2>&1 \ | perl -ne 'if (/dbsize=(\d+)/) {print $1;}'` onemeginblocks=`expr 1048576 / $bsize` -_scratch_mount || _fail "mount failed" +_scratch_mount echo "done"
@@ -81,7 +81,7 @@ do _do "Grow filesystem to ${size}m" "xfs_growfs -D $grow_size $SCRATCH_MNT" echo -n "Flush filesystem... " _do "_scratch_unmount" - _do "_scratch_mount" + _do "_scratch_mount_nocheck" echo "done" echo -n "Check files... " if ! _do "src/fill2fs_check $tmp.manifest"; then
tests/xfs/042 +2 -2
@@ -75,7 +75,7 @@ _do_die_on_error=message_only echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... " _scratch_mkfs_xfs -dsize=48m,agcount=3 2>&1 >/dev/null || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount echo "done"
@@ -97,7 +97,7 @@ _do "xfs_bmap -vp $SCRATCH_MNT/fill" echo "done" # flush the filesystem - make sure there is no space "lost" to pre-allocation _do "_scratch_unmount" -_do "_scratch_mount" +_do "_scratch_mount_nocheck" echo -n "Use up any further available space... " _do "$XFS_IO_PROG -f -c \"falloc 0 1m\" $SCRATCH_MNT/pad" echo "done"
tests/xfs/044 +2 -2
@@ -60,7 +60,7 @@ _filter_logprint() _check_mount() { echo " *** mount (expect success)" - if ! _scratch_mount + if ! _scratch_mount_nocheck then echo " !!! mount failed (expecting success)" status=1
@@ -79,7 +79,7 @@ _check_mount() _check_no_mount() { echo " *** mount (expect failure)" - if _scratch_mount >$tmp.err 2>&1 + if _scratch_mount_nocheck >$tmp.err 2>&1 then cat $tmp.err echo " !!! mount succeeded (expecting failure)"
tests/xfs/045 +2 -2
@@ -61,7 +61,7 @@ then fi echo "*** mount fs with bad mount option (expect failure)" -if _scratch_mount -o foobar >$tmp.out 2>&1 +if _scratch_mount_nocheck -o foobar >$tmp.out 2>&1 then cat $tmp.out echo "!!! mount succeeded (expecting failure)"
@@ -72,7 +72,7 @@ echo "*** duplicate uuid" xfs_db -x -c "uuid $uuid" `_scratch_xfs_db_options` >/dev/null echo "*** mount fs with duplicate uuid (expect failure)" -if _scratch_mount >$tmp.out 2>&1 +if _scratch_mount_nocheck >$tmp.out 2>&1 then cat $tmp.out echo "!!! mount succeeded (expecting failure)"
tests/xfs/057 +1 -1
@@ -77,7 +77,7 @@ sdev=$(_short_dev $SCRATCH_DEV) # use a small log fs _scratch_mkfs_sized $((1024 * 1024 * 500)) >> $seqres.full 2>&1 || _fail "mkfs failed" -_scratch_mount || _fail "mount failed" +_scratch_mount # populate the fs with some data and cycle the mount to reset the log head/tail $FSSTRESS_PROG -d $SCRATCH_MNT -z -fcreat=1 -p 4 -n 100000 > /dev/null 2>&1
tests/xfs/067 +1 -1
@@ -52,7 +52,7 @@ if [ "$isize" -lt 1024 ]; then _scratch_mkfs_xfs -i size=1024 >>$seqres.full \ || _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified" fi -_scratch_mount >>$seqres.full || _fail "mount failed" +_scratch_mount xfs_info $SCRATCH_MNT >>$seqres.full cd $SCRATCH_MNT
tests/xfs/072 +1 -1
@@ -54,7 +54,7 @@ rm -f $seqres.full _scratch_unmount >/dev/null 2>&1 _scratch_mkfs_xfs >/dev/null || _fail "mkfs failed" -_scratch_mount >/dev/null || _fail "mount failed" +_scratch_mount # check there's enough freespace on $SCRATCH_MNT ... (1GiB + 1MiB) avail=`df -P $SCRATCH_MNT | awk 'END {print $4}'`
tests/xfs/073 +1 -1
@@ -139,7 +139,7 @@ _require_loop rm -f $seqres.full _scratch_mkfs_xfs -dsize=41m,agcount=2 >>$seqres.full 2>&1 -_scratch_mount 2>/dev/null || _fail "initial scratch mount failed" +_scratch_mount_nocheck 2>/dev/null || _fail "initial scratch mount failed" echo echo === populating scratch device
tests/xfs/075 +2 -2
@@ -50,10 +50,10 @@ echo "Silence is golden" _scratch_mkfs_sized $((512 * 1024 * 1024)) >$seqres.full # first ro mount with norecovery -_scratch_mount "-o ro,norecovery" >>$seqres.full 2>&1 \ +_scratch_mount_nocheck "-o ro,norecovery" >>$seqres.full 2>&1 \ || _fail "First ro mount failed" # make sure a following remount,rw fails -_scratch_mount "-o remount,rw" >>$seqres.full 2>&1 \ +_scratch_mount_nocheck "-o remount,rw" >>$seqres.full 2>&1 \ && _fail "Second rw remount succeeded" # success, all done
tests/xfs/077 +2 -2
@@ -70,7 +70,7 @@ _test_uuid() | _filter_uuid $EXPECTED_UUID NEW_UUID=`_scratch_xfs_db -c "uuid" | awk '{print $NF}'` _check_scratch_fs - _scratch_mount || _fail "Mount failed after UUID $ACTION" + _scratch_mount_nocheck || _fail "Mount failed after UUID $ACTION" _scratch_unmount }
@@ -127,7 +127,7 @@ $XFS_COPY_PROG $SCRATCH_DEV $IMGFILE 2>&1 >> $seqres.full || \ _check_xfs_filesystem $IMGFILE none none || _fail "Copy looks corrupted" # The copy should have META_UUID feature set _fs_has_META_UUID $IMGFILE || _fail "META_UUID feature not set on copy" -_scratch_mount || _fail "Mount failed after UUID rewrite" +_scratch_mount_nocheck || _fail "Mount failed after UUID rewrite" _scratch_unmount rm -f $IMGFILE
tests/xfs/079 +1 -1
@@ -78,7 +78,7 @@ wait # log record extended header count, as the log record header can only handle 32k # of space. _scratch_unmount -_scratch_mount "-o logbsize=64k" +_scratch_mount_nocheck "-o logbsize=64k" # The mount may not fail on v4 filesystems. Check for CRC mismatch warning # messages to detect failure in this case.
tests/xfs/083 +3 -3
@@ -75,7 +75,7 @@ scratch_repair() { elif [ "${res}" -eq 2 ]; then # replay log? echo "+++ replaying log" >> "${FSCK_LOG}" - _scratch_mount >> "${FSCK_LOG}" 2>&1 + _scratch_mount_nocheck >> "${FSCK_LOG}" 2>&1 res=$? echo "+++ mount returns ${res}" >> "${FSCK_LOG}" if [ "${res}" -gt 0 ]; then
@@ -127,7 +127,7 @@ echo "++ corrupt image" >> $seqres.full xfs_db -x -c blockget -c "blocktrash ${FUZZ_ARGS}" "${SCRATCH_DEV}" >> $seqres.full 2>&1 echo "++ mount image" >> $seqres.full -_scratch_mount >> $seqres.full 2>&1 +_scratch_mount_nocheck >> $seqres.full 2>&1 echo "+++ test scratch" >> $seqres.full _scratch_fuzz_test >> $seqres.full 2>&1
@@ -149,7 +149,7 @@ _scratch_xfs_repair >> $seqres.full 2>&1 ROUND2_LOG="${tmp}-round2-${fsck_pass}.log" echo "++ mount image (2)" >> $ROUND2_LOG -_scratch_mount >> $ROUND2_LOG 2>&1 +_scratch_mount_nocheck >> $ROUND2_LOG 2>&1 echo "++ chattr -R -i" >> $ROUND2_LOG $CHATTR_PROG -R -f -i "${SCRATCH_MNT}/" > /dev/null 2>> $ROUND2_LOG
tests/xfs/085 +1 -1
@@ -88,7 +88,7 @@ echo "+ corrupt image" $XFS_IO_PROG -f -c "pwrite -S 0x62 32 4" "${SCRATCH_DEV}" >> $seqres.full echo "+ mount image" -_scratch_mount 2>/dev/null && _fail "mount should not succeed" +_scratch_mount_nocheck 2>/dev/null && _fail "mount should not succeed" echo "+ repair fs" _scratch_xfs_repair >> $seqres.full 2>&1
tests/xfs/090 +1 -1
@@ -57,7 +57,7 @@ _create_scratch() fi echo "*** mount" - if ! _scratch_mount + if ! _scratch_mount_nocheck then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/092 +1 -1
@@ -53,7 +53,7 @@ MOUNT_OPTIONS="$MOUNT_OPTIONS -o inode64" _scratch_mkfs_xfs | _filter_mkfs 2>/dev/null echo Silence is golden -_scratch_mount +_scratch_mount_nocheck [ $? -eq 0 ] || echo "inode64 mount failed unexpectedly!" # success, all done
tests/xfs/094 +1 -1
@@ -78,7 +78,7 @@ _create_scratch() fi echo "*** mount" - if ! _scratch_mount + if ! _scratch_mount_nocheck then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/098 +1 -1
@@ -94,7 +94,7 @@ logblocks="$(_scratch_xfs_get_sb_field logblocks)" $XFS_IO_PROG -f -c "pwrite -S 0x62 ${logstart} $((logblocks * blksz))" "${SCRATCH_DEV}" >> $seqres.full echo "+ mount image" -_scratch_mount 2>/dev/null && _fail "mount should not succeed" +_scratch_mount_nocheck 2>/dev/null && _fail "mount should not succeed" echo "+ repair fs" _repair_scratch_fs >> $seqres.full 2>&1
tests/xfs/103 +1 -1
@@ -46,7 +46,7 @@ _create_scratch() fi echo "*** mount" - if ! _scratch_mount 2>/dev/null + if ! _scratch_mount_nocheck 2>/dev/null then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/104 +1 -1
@@ -42,7 +42,7 @@ _create_scratch() . $tmp.mkfs echo "*** mount" - if ! _scratch_mount 2>/dev/null + if ! _scratch_mount_nocheck 2>/dev/null then echo "failed to mount $SCRATCH_DEV" exit 1
tests/xfs/111 +1 -1
@@ -70,7 +70,7 @@ BYTE=`_scratch_xfs_db -c "convert inode $INO byte" \ echo Blat inode clusters src/itrash $SCRATCH_DEV $BYTE -_scratch_mount || _fail "Couldn't mount after itrash" +_scratch_mount_nocheck || _fail "Couldn't mount after itrash" echo Attempting bulkstat #src/bstat -q $SCRATCH_MNT
tests/xfs/121 +3 -3
@@ -54,7 +54,7 @@ _scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" echo "mount" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
@@ -82,7 +82,7 @@ echo "logprint after going down..." _print_logstate echo "mount with replay" -_scratch_mount $mnt >>$seqres.full 2>&1 \ +_scratch_mount_nocheck $mnt >>$seqres.full 2>&1 \ || _fail "mount failed: $mnt $MOUNT_OPTIONS" echo "godown"
@@ -103,7 +103,7 @@ else fi # clean up dirty log with log recovery on mount -_scratch_mount >> $seqres.full 2>&1 \ +_scratch_mount_nocheck >> $seqres.full 2>&1 \ || _fail "mount failed" # success, all done
tests/xfs/130 +1 -1
@@ -79,7 +79,7 @@ seq 0 $((agcount - 1)) | while read ag; do done echo "+ mount image" -_scratch_mount >> $seqres.full 2>&1 && \ +_scratch_mount_nocheck >> $seqres.full 2>&1 && \ echo "Should not be able to mount with broken refcountbt." _scratch_unmount >> $seqres.full 2>&1
tests/xfs/137 +2 -2
@@ -69,13 +69,13 @@ _scratch_unmount # because the sb LSN is ahead of the current LSN. If it doesn't fail, push the # cycle back further and try again. _scratch_xfs_db -x -c "logformat" >> $seqres.full 2>&1 -_scratch_mount >> $seqres.full 2>&1 +_scratch_mount_nocheck >> $seqres.full 2>&1 if [ $? != 0 ]; then echo mount failure detected else _scratch_unmount _scratch_xfs_db -x -c "logformat -c 2" >> $seqres.full 2>&1 - _scratch_mount >> $seqres.full 2>&1 || echo mount failure detected + _scratch_mount_nocheck >> $seqres.full 2>&1 || echo mount failure detected fi # verify that repair detects invalid LSNs as well
tests/xfs/141 +1 -1
@@ -79,7 +79,7 @@ for i in $(seq 1 5); do # Verify that we can remount the fs. Log recovery should handle the torn # write. _scratch_unmount - _scratch_mount || _fail "failed to mount" + _scratch_mount done # success, all done
tests/xfs/177 +2 -4
@@ -59,8 +59,7 @@ _scratch_unmount > /dev/null 2>&1 _scratch_mkfs_xfs >/dev/null 2>&1 \ || _fail "mkfs failed" -_scratch_mount \ - || _fail "mount failed" +_scratch_mount # run Mark Goodwin test here # Usage: ./bulkstat_unlink_test iterations nfiles stride dir
@@ -73,8 +72,7 @@ $here/src/bulkstat_unlink_test 20 1000 3 $SCRATCH_MNT/bulkstat # Mount scratch with ikeep enabled _scratch_unmount -_scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT" \ - || _fail "mount failed" +_scratch_mount "-o dmapi,mtpt=$SCRATCH_MNT" echo "Start bulkstat_unlink_test_modified" $here/src/bulkstat_unlink_test_modified 10 1000 1 $SCRATCH_MNT/bulkstat
tests/xfs/181 +1 -1
@@ -61,7 +61,7 @@ _scratch_mkfs_xfs >>$seqres.full 2>&1 \ || _fail "mkfs scratch failed" echo "mount" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS" # num_files must be greater than 64 (XFS_AGI_UNLINKED_BUCKETS)
tests/xfs/183 +1 -2
@@ -53,8 +53,7 @@ _require_scratch _scratch_mkfs_xfs >/dev/null 2>&1 \ || _fail "mkfs failed" -_scratch_mount \ - || _fail "mount failed" +_scratch_mount # run Mark Goodwin test here # Usage: ./bulkstat_unlink_test iterations nfiles stride dir
tests/xfs/189 +7 -7
@@ -108,7 +108,7 @@ _test_remount_rw() echo echo "try remount ro,filestreams -> rw,filestreams" echo - _scratch_mount -o ro,filestreams + _scratch_mount_nocheck -o ro,filestreams [ $? -eq 0 ] || echo "ro,filestreams mount failed unexpectedly" _check_mount ro filestreams
@@ -127,7 +127,7 @@ _test_remount_rw() echo echo "try remount ro,noattr2 -> rw,attr2" echo - _scratch_mount -o ro,noattr2 + _scratch_mount_nocheck -o ro,noattr2 [ $? -eq 0 ] || echo "ro,noattr2 mount failed unexpectedly" _check_mount ro
@@ -149,7 +149,7 @@ _test_remount_write() echo echo "try touching file after remount ro -> rw with options" echo - _scratch_mount + _scratch_mount_nocheck [ $? -eq 0 ] || echo "mount (1) failed unexpectedly" touch $SCRATCH_MNT/foobar
@@ -157,7 +157,7 @@ _test_remount_write() _scratch_unmount - _scratch_mount -o ro + _scratch_mount_nocheck -o ro [ $? -eq 0 ] || echo "mount (2) failed unexpectedly" _mount -o remount,rw,filestreams $SCRATCH_MNT
@@ -181,15 +181,15 @@ _test_remount_barrier() echo # mention barrier explicitly even if it's currently the default just to be sure - _scratch_mount -o barrier + _scratch_mount_nocheck -o barrier [ $? -eq 0 ] || echo "mount failed unexpectedly!" _check_mount rw - _scratch_mount -o remount,nobarrier + _scratch_mount_nocheck -o remount,nobarrier [ $? -eq 0 ] || _fail "remount nobarrier failed" _check_mount rw nobarrier - _scratch_mount -o remount,barrier + _scratch_mount_nocheck -o remount,barrier [ $? -eq 0 ] || _fail "remount barrier failed" _check_mount rw
tests/xfs/263 +1 -1
@@ -82,7 +82,7 @@ function test_all_state() echo "== Options: $OPTIONS ==" # Some combinations won't mount on V4 supers (grp + prj) _qmount_option "$OPTIONS" - _scratch_mount &>> $seqres.full || continue + _scratch_mount_nocheck &>> $seqres.full || continue $XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | filter_quota_state _scratch_unmount done
tests/xfs/270 +2 -2
@@ -63,14 +63,14 @@ $XFS_DB_PROG -x -c "sb 0" -c "write features_ro_compat $((2**31))" $SCRATCH_DEV # rw mount with unknown ro-compat feature should fail echo "rw mount test" -_scratch_mount 2>>$seqres.full +_scratch_mount_nocheck 2>>$seqres.full if [ $? -eq 0 ]; then _fail "rw mount test failed" fi # But ro mount should succeed echo "ro mount test" -_scratch_mount -o ro +_scratch_mount_nocheck -o ro if [ $? -ne 0 ]; then _fail "ro mount test failed" else
tests/xfs/297 +1 -1
@@ -52,7 +52,7 @@ _require_command "$KILLALL_PROG" killall rm -f $seqres.full _scratch_mkfs_xfs -d agcount=16,su=256k,sw=12 -l su=256k,size=5120b >/dev/null 2>&1 -_scratch_mount >>$seqres.full 2>&1 || _fail "mount failed" +_scratch_mount_nocheck >>$seqres.full 2>&1 || _fail "mount failed" STRESS_DIR="$SCRATCH_MNT/testdir" mkdir -p $STRESS_DIR
tests/xfs/333 +1 -1
@@ -64,7 +64,7 @@ _scratch_unmount echo "Corrupt fs" _scratch_xfs_db -x -c 'sb 0' -c "write rrmapino $ino" >> $seqres.full -_scratch_mount 2>&1 | _filter_error_mount +_scratch_mount_nocheck 2>&1 | _filter_error_mount echo "Test done, mount should have failed"
tests/xfs/338 +1 -1
@@ -60,7 +60,7 @@ echo "Corrupt fs" _scratch_xfs_db -x -c 'sb 0' -c 'addr rrmapino' \ -c 'write core.nlinkv2 0' -c 'write core.mode 0' -c 'sb 0' \ -c 'write rrmapino 0' >> $seqres.full -_scratch_mount >> $seqres.full 2>&1 && echo "mount should have failed" +_scratch_mount_nocheck >> $seqres.full 2>&1 && echo "mount should have failed" echo "Repair fs" _scratch_unmount 2>&1 | _filter_scratch
tests/xfs/340 +1 -1
@@ -65,7 +65,7 @@ _scratch_xfs_db -x -c "inode $rrmapino" \ -c 'write core.nblocks 0' -c 'sb 0' -c 'addr rootino' \ -c "write u3.sfdir3.list[2].inumber.i4 $rrmapino" \ -c 'sb 0' -c "write rrmapino $ino" >> $seqres.full -_scratch_mount >> $seqres.full 2>&1 && echo "mount should have failed" +_scratch_mount_nocheck >> $seqres.full 2>&1 && echo "mount should have failed" echo "Repair fs" _scratch_unmount 2>&1 | _filter_scratch
tests/xfs/433 +1 -1
@@ -65,7 +65,7 @@ _require_scratch _require_attrs _scratch_mkfs > $seqres.full 2>&1 -_scratch_mount || _fail "mount failure" +_scratch_mount file=$SCRATCH_MNT/testfile
tests/xfs/434 +1 -1
@@ -99,7 +99,7 @@ _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startbloc _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full # Suddenly enable quota to test if we can leak the quotacheck dquots! -_scratch_mount -o quota >> $seqres.full 2>&1 +_scratch_mount_nocheck -o quota >> $seqres.full 2>&1 _scratch_unmount 2> /dev/null rm -f ${RESULT_DIR}/require_scratch
tests/xfs/435 +1 -1
@@ -77,7 +77,7 @@ echo "Remount to check recovery" | tee /dev/ttyprintk _scratch_unmount _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startblock ones' >> $seqres.full _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full -_scratch_mount -o quota >> $seqres.full 2>&1 +_scratch_mount_nocheck -o quota >> $seqres.full 2>&1 _scratch_unmount 2> /dev/null rm -f ${RESULT_DIR}/require_scratch
tests/xfs/436 +1 -1
@@ -93,7 +93,7 @@ _scratch_unmount _scratch_dump_log >> $seqres.full _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c 'fuzz -d recs[1].startblock ones' >> $seqres.full _scratch_xfs_db -x -c 'agf 0' -c 'addr refcntroot' -c p >> $seqres.full -_scratch_mount -o noquota >> $seqres.full 2>&1 +_scratch_mount_nocheck -o noquota >> $seqres.full 2>&1 _scratch_unmount 2> /dev/null rm -f ${RESULT_DIR}/require_scratch
tests/xfs/439 +1 -1
@@ -67,7 +67,7 @@ lsunit=$(_scratch_xfs_get_sb_field logsunit) # Mount and writing log may trigger a crash on buggy kernel # The fix applied kernel refuses to mount, so a mount failure is # expected -if _scratch_mount >> $seqres.full 2>&1; then +if _scratch_mount_nocheck >> $seqres.full 2>&1; then for i in $(seq 1 1000); do echo > ${SCRATCH_MNT}/$i done
Signature · 1 line
2.14.3
Re: [PATCH 2/2] fstests: use _scratch_mount_nocheck where appropriate in tests
Quoted 1 line · Eryu Guan
Also remove redundant status checks of
_scratch_mount.
Is there any correlation between tests that need to use _scratch_mount_nocheck tests which _require_scratch_nocheck that could make some of these annotations automatic?
Amir.
Re: [PATCH 2/2] fstests: use _scratch_mount_nocheck where appropriate in tests
Quoted 6 lines · Amir Goldstein
Quoted 1 line · Eryu Guan
Also remove redundant status checks of
_scratch_mount.Is there any correlation between tests that need to use
_scratch_mount_nochecktests which_require_scratch_nocheckthat could make some of these annotations automatic?
No, they have totally different meanings. _require_scratch_nocheck means don't do filesystem check after test, and _scratch_mount_nocheck means don't check mount status.
Perhaps it's just badly named, I can follow Andreas's suggestion to name it as _try_scratch_mount or similar names.
Thanks,
Eryu
Re: [PATCH 2/2] fstests: use _scratch_mount_nocheck where appropriate in tests
Quoted 8 lines · Eryu Guan
Quoted 6 lines · Amir Goldstein
Quoted 1 line · Eryu Guan
Also remove redundant status checks of
_scratch_mount.Is there any correlation between tests that need to use
_scratch_mount_nochecktests which_require_scratch_nocheckthat could make some of these annotations automatic?
Quoted 6 lines
No, they have totally different meanings.
_require_scratch_nocheckmeans don't do filesystem check after test, and_scratch_mount_nocheckmeans don't check mount status.Perhaps it's just badly named, I can follow Andreas's suggestion to name it as
_try_scratch_mountor similar names.
To me, "nocheck" tends to indicate that the result isn't checked because it doesn't matter, so _try_scratch_mount seems much better.
Thanks,
Andreas
Re: [PATCH 2/2] fstests: use _scratch_mount_nocheck where appropriate in tests
In reply to Eryu GuanQuoted 4 lines · Eryu Guan
Also remove redundant status checks of
_scratch_mount.Signed-off-by Eryu Guan <[email protected]>---
<skipping to the generic and xfs tests>
Quoted 14 lines
tests/generic/054 +1
-1@@ -83,7 +83,7 @@ for s in sync nosync ; do # mount the FS _echofull "mount" - if ! _scratch_mount >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fi
tests/generic/054 for s in sync nosync ; do · line 122
Quoted 6 lines
tests/generic/054 +1
-1@@ -118,7 +118,7 @@ for s in sync nosync ; do _print_logstate _echofull "mount with replay" - _scratch_mount >>$seqres.full 2>&1 \ + _scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS"
nocheck || fail ??
I wonder if the fail message should always spit out the mount options that were tried?
tests/generic/068 echo "*** MKFS ***" >>$seqres.full · line 66
Quoted 11 lines
tests/generic/068 +1
-1@@ -62,7 +62,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed"
Can this remain _scratch_mount, since we _fail anyway?
(There are more of these scattered throughout.)
--D
Re: [PATCH 2/2] fstests: use _scratch_mount_nocheck where appropriate in tests
Quoted 31 lines · Darrick J. Wong
Quoted 4 lines · Eryu Guan
Also remove redundant status checks of
_scratch_mount.Signed-off-by Eryu Guan <[email protected]>---
<skipping to the generic and xfs tests>
Quoted 14 lines
tests/generic/054 +1
-1@@ -83,7 +83,7 @@ for s in sync nosync ; do # mount the FS _echofull "mount" - if ! _scratch_mount >>$seqres.full 2>&1; then + if ! _scratch_mount_nocheck >>$seqres.full 2>&1; then _echofull "mount failed: $MOUNT_OPTIONS" continue fitests/generic/054 for s in sync nosync ; do · line 122
Quoted 6 lines
tests/generic/054 +1
-1@@ -118,7 +118,7 @@ for s in sync nosync ; do _print_logstate _echofull "mount with replay" - _scratch_mount >>$seqres.full 2>&1 \ + _scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed: $MOUNT_OPTIONS"nocheck || fail ??
Quoted 2 lines
I wonder if the fail message should always spit out the mount options that were tried?
Seems there's no need to do so in this case, as we know what $MOUNT_OPTIONS we're using. We could dump the specific mount options if the test uses non-default options and really cares about it, and this should be done case-by-case.
Quoted 15 lines
tests/generic/068 echo "*** MKFS ***" >>$seqres.full · line 66
Quoted 12 lines
tests/generic/068 +1
-1@@ -62,7 +62,7 @@ echo "*** MKFS ***" >>$seqres.full echo "" >>$seqres.full _scratch_mkfs >>$seqres.full 2>&1 \ || _fail "mkfs failed" -_scratch_mount >>$seqres.full 2>&1 \ +_scratch_mount_nocheck >>$seqres.full 2>&1 \ || _fail "mount failed"Can this remain
_scratch_mount, since we_failanyway?
Quoted 1 line
(There are more of these scattered throughout.)
Sure. I thought it'd be better to keep dumping mount error message to $seqres.full and keep the pretty format :) But seems that's not necessary, the error message would break golden image anyway.
I'll revisit the tests with similar patterns.
Thanks,
Eryu
Quoted 18 lines · Eryu Guan
Hi all,
This is an RFC patchset that follows Andreas Gruenbacher's recent post "Failing scratch mounts"[1]. It changes
_scratch_mountto call_failon mount failure by default, so that when the mount fails, the tests won't write to the underlying filesystem and fail in implicit way, which sometimes makes debugging harder to do.Also introduce a new
_scratch_mount_nocheckhelper, which mount scratch device and doesn't check the mount status, for tests that need to check mount status themselves.This two-patch patchset should really be one patch, but for easy review, I split the patch into two pieces, the first patch introduce the new
_scratch_mount_nocheckhelper and converts_scratch_mountusages in common dir, the second patch converts all the tests (which can be tedious).
Quoted 6 lines
I've tested it by running full '-g auto' tests against xfs/xfs with reflink/ext4/btrfs and I didn't see any new failures.
(Note that I based this patchset against fstests release on Feb. 4th, so I didn't convert the new tests release on Feb. 11th. And as this is an RFC, I didn't write detailed commit log in each patch.)
These patches do fix the scratch mount problems I've been seeing on gfs2.
Thanks,
Andreas