From patchwork Mon Nov 11 14:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 11237189 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 282C316B1 for ; Mon, 11 Nov 2019 14:50:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 102A0222CB for ; Mon, 11 Nov 2019 14:50:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbfKKOuB (ORCPT ); Mon, 11 Nov 2019 09:50:01 -0500 Received: from mx2.suse.de ([195.135.220.15]:52780 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726949AbfKKOuA (ORCPT ); Mon, 11 Nov 2019 09:50:00 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2C3D5ACB7; Mon, 11 Nov 2019 14:49:59 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 504ED1E155E; Mon, 11 Nov 2019 15:49:58 +0100 (CET) From: Jan Kara To: Cc: "Darrick J. Wong" , Eryu Guan , Jan Kara Subject: [PATCH 1/3] generic/050: Fix test failure for filesystems without journal Date: Mon, 11 Nov 2019 15:49:51 +0100 Message-Id: <20191111144953.23871-2-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191111144953.23871-1-jack@suse.cz> References: <20191111144953.23871-1-jack@suse.cz> Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Filesystems without journal can happily mount unrecovered filesystem read-only which confuses this test. Handle this by providing different expected output for filesystems without journal. Signed-off-by: Jan Kara --- common/rc | 33 +++++++++++++++++++++++------- tests/generic/050 | 8 ++++++++ tests/generic/050.cfg | 1 + tests/generic/{050.out => 050.out.default} | 0 tests/generic/050.out.nojournal | 22 ++++++++++++++++++++ 5 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 tests/generic/050.cfg rename tests/generic/{050.out => 050.out.default} (100%) create mode 100644 tests/generic/050.out.nojournal diff --git a/common/rc b/common/rc index ef0c250923e4..753bce7fc8a9 100644 --- a/common/rc +++ b/common/rc @@ -3159,7 +3159,7 @@ _require_norecovery() # It's possible that TEST_DEV and SCRATCH_DEV have different features (it'd be # odd, but possible) so check $TEST_DEV by default, but we can optionall pass # any dev we want. -_require_metadata_journaling() +_has_metadata_journaling() { if [ -z $1 ]; then local dev=$TEST_DEV @@ -3169,26 +3169,37 @@ _require_metadata_journaling() case "$FSTYP" in ext2|vfat|msdos|udf) - _notrun "$FSTYP does not support metadata journaling" + echo "$FSTYP does not support metadata journaling" + return 1 ;; ext4) # ext4 could be mkfs'd without a journal... _require_dumpe2fs - $DUMPE2FS_PROG -h $dev 2>&1 | grep -q has_journal || \ - _notrun "$FSTYP on $dev not configured with metadata journaling" + $DUMPE2FS_PROG -h $dev 2>&1 | grep -q has_journal || { + echo "$FSTYP on $dev not configured with metadata journaling" + return 1 + } # ext4 might not load a journal - _exclude_scratch_mount_option "noload" + if _normalize_mount_options | grep -qw "noload"; then + echo "mount option \"noload\" not allowed in this test" + return 1 + fi ;; overlay) # metadata journaling check is based on base filesystem configurations # and because -overlay option saves those configurations to OVL_BASE_*, # adding restore/override the configurations before/after the check. if [ ! -z $OVL_BASE_FSTYP -a $OVL_BASE_FSTYP != "overlay" ]; then + local ret + _overlay_config_restore - _require_metadata_journaling + _has_metadata_journaling + ret=$? _overlay_config_override + return $ret else - _notrun "No metadata journaling support for legacy overlay setup" + echo "No metadata journaling support for legacy overlay setup" + return 1 fi ;; *) @@ -3197,6 +3208,14 @@ _require_metadata_journaling() esac } +_require_metadata_journaling() +{ + msg=$(_has_metadata_journaling $@) + if [ -n "$msg" ]; then + _notrun "$msg" + fi +} + _count_extents() { $XFS_IO_PROG -c "fiemap" $1 | tail -n +2 | grep -v hole | wc -l diff --git a/tests/generic/050 b/tests/generic/050 index 91632d2d0010..a8d648e5eede 100755 --- a/tests/generic/050 +++ b/tests/generic/050 @@ -6,6 +6,7 @@ # # Check out various mount/remount/unmount scenarious on a read-only blockdev. # +seqfull=$0 seq=`basename $0` seqres=$RESULT_DIR/$seq echo "QA output created by $seq" @@ -34,6 +35,13 @@ _require_scratch_shutdown _require_local_device $SCRATCH_DEV _require_norecovery +# Select appropriate output file +features="" +if ! _has_metadata_journaling $SCRATCH_DEV >/dev/null; then + features="nojournal" +fi +_link_out_file "$features" + _scratch_mkfs >/dev/null 2>&1 filter_ro_mount() { diff --git a/tests/generic/050.cfg b/tests/generic/050.cfg new file mode 100644 index 000000000000..c76bd473873b --- /dev/null +++ b/tests/generic/050.cfg @@ -0,0 +1 @@ +nojournal: nojournal diff --git a/tests/generic/050.out b/tests/generic/050.out.default similarity index 100% rename from tests/generic/050.out rename to tests/generic/050.out.default diff --git a/tests/generic/050.out.nojournal b/tests/generic/050.out.nojournal new file mode 100644 index 000000000000..c652c555aae4 --- /dev/null +++ b/tests/generic/050.out.nojournal @@ -0,0 +1,22 @@ +QA output created by 050 +setting device read-only +mounting read-only block device: +mount: device write-protected, mounting read-only +touching file on read-only filesystem (should fail) +touch: cannot touch 'SCRATCH_MNT/foo': Read-only file system +unmounting read-only filesystem +setting device read-write +mounting read-write block device: +touch files +going down: +unmounting shutdown filesystem: +setting device read-only +mounting filesystem that needs recovery on a read-only device: +mount: device write-protected, mounting read-only +unmounting read-only filesystem +mounting filesystem with -o norecovery on a read-only device: +mount: device write-protected, mounting read-only +unmounting read-only filesystem +setting device read-write +mounting filesystem that needs recovery with -o ro: +*** done