diff options
author | Xiao Yang <yangx.jy@cn.fujitsu.com> | 2016-09-14 10:52:36 +0800 |
---|---|---|
committer | Eryu Guan <eguan@redhat.com> | 2016-09-15 12:26:49 +0800 |
commit | f4a4c64c296e25ea5556a88fb6b11ceb542c0687 (patch) | |
tree | 5bab0a215ab8a93a965c548b64ae636d1a241d76 | |
parent | 88d00424cff193597493c7b3d7c318ecaa536d54 (diff) | |
download | xfstests-dev-f4a4c64c296e25ea5556a88fb6b11ceb542c0687.tar.gz |
xfs/098: fix xfs_repair on newer xfsprogs
1) use _repair_scratch_fs instead of xfs_repair
The obsolete xfs_repair always cleared the log regardless of
whether it is corrupted and current xfs_repair only cleared the
log when -L option is specified. xfs_repair -L option should be
used to clear it if xfs_repair failed to clear log.
2) catch non-zero return value instead of 2
It can be applied to both the old return value 1 and the new
return value 2
3) add filter_xfs_dmesg to ignore mount related warnings
If we corrupt log and mount on a CONFIG_XFS_WARN build, there
will be mount related warnings in dmesg as expected.
Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
-rw-r--r-- | common/rc | 2 | ||||
-rwxr-xr-x | tests/xfs/098 | 16 |
2 files changed, 16 insertions, 2 deletions
@@ -1152,7 +1152,7 @@ _repair_scratch_fs() xfs) _scratch_xfs_repair "$@" 2>&1 res=$? - if [ "$res" -eq 2 ]; then + if [ "$res" -ne 0 ]; then echo "xfs_repair returns $res; replay log?" _scratch_mount res=$? diff --git a/tests/xfs/098 b/tests/xfs/098 index d91d617b80..86ec62cedf 100755 --- a/tests/xfs/098 +++ b/tests/xfs/098 @@ -54,6 +54,17 @@ _require_xfs_db_blocktrash_z_command test -z "${FUZZ_ARGS}" && FUZZ_ARGS="-n 8 -3" rm -f $seqres.full + +# If we corrupt log on a CONFIG_XFS_WARN build, there will be mount related +# WARNINGs in dmesg as expected. We don't want to simply _disable_dmesg_check +# which could miss other potential bugs, so filter out the intentional WARNINGs, +# make sure test doesn't fail because of this warning and fails on other WARNINGs. +filter_xfs_dmesg() +{ + local warn="WARNING:.*fs/xfs/xfs_message\.c:.*asswarn.*" + sed -e "s#$warn#Intentional warnings in asswarn#" +} + TESTDIR="${SCRATCH_MNT}/scratchdir" TESTFILE="${TESTDIR}/testfile" @@ -93,7 +104,10 @@ echo "+ mount image" _scratch_mount 2>/dev/null && _fail "mount should not succeed" echo "+ repair fs" -_scratch_xfs_repair >> $seqres.full 2>&1 +_repair_scratch_fs >> $seqres.full 2>&1 + +# mount may trigger related WARNINGs, so filter them. +_check_dmesg filter_xfs_dmesg echo "+ mount image (2)" _scratch_mount |