From: Eryu Guan Date: Mon, 6 Mar 2017 11:45:57 +0000 (+0800) Subject: generic: require journal in shutdown tests X-Git-Tag: v2022.05.01~2129 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11a3e8bd821cb96f1fa6036263f933581296ba26;p=xfstests-dev.git 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 Signed-off-by: Eryu Guan --- diff --git a/tests/generic/042 b/tests/generic/042 index 6eecbdce..68ff03c6 100755 --- a/tests/generic/042 +++ b/tests/generic/042 @@ -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" diff --git a/tests/generic/043 b/tests/generic/043 index b76a5aa8..3d98ab05 100755 --- a/tests/generic/043 +++ b/tests/generic/043 @@ -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 diff --git a/tests/generic/044 b/tests/generic/044 index 0331baa6..eb64b860 100755 --- a/tests/generic/044 +++ b/tests/generic/044 @@ -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 diff --git a/tests/generic/045 b/tests/generic/045 index 874c9559..5ef747f2 100755 --- a/tests/generic/045 +++ b/tests/generic/045 @@ -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 diff --git a/tests/generic/046 b/tests/generic/046 index 5a894b85..882cb095 100755 --- a/tests/generic/046 +++ b/tests/generic/046 @@ -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 diff --git a/tests/generic/047 b/tests/generic/047 index 631dc1e4..d7e4610d 100755 --- a/tests/generic/047 +++ b/tests/generic/047 @@ -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() diff --git a/tests/generic/048 b/tests/generic/048 index 51d7efd2..3f0bcc18 100755 --- a/tests/generic/048 +++ b/tests/generic/048 @@ -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 diff --git a/tests/generic/049 b/tests/generic/049 index 12992422..1f2a4b2b 100755 --- a/tests/generic/049 +++ b/tests/generic/049 @@ -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() diff --git a/tests/generic/051 b/tests/generic/051 index 7b807b9f..29ac61b6 100755 --- a/tests/generic/051 +++ b/tests/generic/051 @@ -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)) diff --git a/tests/generic/052 b/tests/generic/052 index f7cdd09c..65d430d1 100755 --- a/tests/generic/052 +++ b/tests/generic/052 @@ -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 \ diff --git a/tests/generic/054 b/tests/generic/054 index 8375e574..4d4be59b 100755 --- a/tests/generic/054 +++ b/tests/generic/054 @@ -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 diff --git a/tests/generic/055 b/tests/generic/055 index 207c007f..aed3b28c 100755 --- a/tests/generic/055 +++ b/tests/generic/055 @@ -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 \ diff --git a/tests/generic/388 b/tests/generic/388 index 3729aa5b..27602085 100755 --- a/tests/generic/388 +++ b/tests/generic/388 @@ -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 diff --git a/tests/generic/392 b/tests/generic/392 index b8af8a08..6922f7d2 100755 --- a/tests/generic/392 +++ b/tests/generic/392 @@ -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