generic: require journal in shutdown tests

Tests in shutdown group are supposed to test journal recovery after
filesystem shutdown, and the tests assume the filesystem in test has
journal support. But with the ext4 shutdown function added in
4.11-rc kernel, ext2 gains shutdown support too when driving with
ext4 driver, so generic/051 fails because fs corruption after test.

Adding _require_metadata_journaling to all generic tests in shutdown
group to ensure there's journal present.

generic/050 is skipped because it has _require_scratch_nocheck,
which indicates no fsck is done after test.

Reviewed-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2017-03-06 19:45:57 +08:00
parent 726726d71d
commit 11a3e8bd82
14 changed files with 18 additions and 0 deletions
+1
View File
@@ -92,6 +92,7 @@ _require_xfs_io_command "fpunch"
_require_xfs_io_command "fzero"
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
_crashtest "falloc -k"
+1
View File
@@ -43,6 +43,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
# create files
+1
View File
@@ -43,6 +43,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
# create files
+1
View File
@@ -43,6 +43,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
# create files
+1
View File
@@ -43,6 +43,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
# create files
+1
View File
@@ -44,6 +44,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
_check_files()
+1
View File
@@ -44,6 +44,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
# Do we have enough space on disk? 10G
+1
View File
@@ -44,6 +44,7 @@ _require_scratch
_require_scratch_shutdown
_require_fiemap
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
_check_files()
+1
View File
@@ -55,6 +55,7 @@ _require_command "$KILLALL_PROG" killall
rm -f $seqres.full
_scratch_mkfs > $seqres.full 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
SLEEP_TIME=$((30 * $TIME_FACTOR))
+1
View File
@@ -53,6 +53,7 @@ _require_logstate
echo "mkfs"
_scratch_mkfs >>$seqres.full 2>&1 \
|| _fail "mkfs scratch failed"
_require_metadata_journaling $SCRATCH_DEV
echo "mount"
_scratch_mount >>$seqres.full 2>&1 \
+3
View File
@@ -50,6 +50,9 @@ _require_logstate
echo "*** init FS"
_scratch_unmount >/dev/null 2>&1
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_get_log_configs > $tmp.seq.params
# Do the work for various log params which
+3
View File
@@ -79,6 +79,9 @@ QUOTA_OPTION=`_get_quota_option`
echo "*** init FS"
_scratch_unmount >/dev/null 2>&1
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_get_log_configs > $tmp.seq.params
cat $tmp.seq.params \
+1
View File
@@ -62,6 +62,7 @@ rm -f $seqres.full
echo "Silence is golden."
_scratch_mkfs >> $seqres.full 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount || _fail "mount failed"
for i in $(seq 1 50); do
+1
View File
@@ -53,6 +53,7 @@ _require_scratch_shutdown
_require_xfs_io_command "fpunch"
_scratch_mkfs >/dev/null 2>&1
_require_metadata_journaling $SCRATCH_DEV
_scratch_mount
testfile=$SCRATCH_MNT/testfile