From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com
Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com
Subject: [PATCH 15/17] xfs: scrub fs (if still mounted) at the end of the test
Date: Thu, 21 Jul 2016 16:47:51 -0700 [thread overview]
Message-ID: <146914487167.11762.17599617419019795848.stgit@birch.djwong.org> (raw)
In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org>
Teach _check_xfs_filesystem to scrub mounted filesystems before
unmounting and fscking them. This is mostly to test the online
scrub tool...
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
README | 3 +++
common/config | 1 +
common/rc | 7 +++++++
3 files changed, 11 insertions(+)
diff --git a/README b/README
index 4509cc1..c19fcb1 100644
--- a/README
+++ b/README
@@ -84,6 +84,9 @@ Preparing system for tests (IRIX and Linux):
run xfs_repair -n to check the filesystem; xfs_repair to rebuild
metadata indexes; and xfs_repair -n (a third time) to check the
results of the rebuilding.
+ - set TEST_XFS_SCRUB=1 to have _check_xfs_filesystem run
+ xfs_scrub -vd to scrub the filesystem metadata online before
+ unmounting to run the offline check.
- or add a case to the switch in common/config assigning
these variables based on the hostname of your test
diff --git a/common/config b/common/config
index 08d5d80..168f46c 100644
--- a/common/config
+++ b/common/config
@@ -163,6 +163,7 @@ export XFS_REPAIR_PROG="`set_prog_path xfs_repair`"
export XFS_DB_PROG="`set_prog_path xfs_db`"
export XFS_GROWFS_PROG=`set_prog_path xfs_growfs`
export XFS_IO_PROG="`set_prog_path xfs_io`"
+export XFS_SCRUB_PROG="`set_prog_path xfs_scrub`"
export XFS_PARALLEL_REPAIR_PROG="`set_prog_path xfs_prepair`"
export XFS_PARALLEL_REPAIR64_PROG="`set_prog_path xfs_prepair64`"
export __XFSDUMP_PROG="`set_prog_path xfsdump`"
diff --git a/common/rc b/common/rc
index 3b45578..861a721 100644
--- a/common/rc
+++ b/common/rc
@@ -2391,6 +2391,13 @@ _check_xfs_filesystem()
if [ "$type" = "xfs" ]
then
+ if [ -n "$TEST_XFS_SCRUB" ] && [ -x "$XFS_SCRUB_PROG" ]; then
+ "$XFS_SCRUB_PROG" $scrubflag -vd $device >>$seqres.full
+ if [ $? -ne 0 ]; then
+ echo "filesystem on $device failed scrub (see $seqres.full)"
+ ok=0
+ fi
+ fi
# mounted ...
mountpoint=`_umount_or_remount_ro $device`
fi
next prev parent reply other threads:[~2016-07-21 23:48 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-21 23:46 [PATCH v7 00/17] xfstests: fixes and new tests for rmap/reflink/etc Darrick J. Wong
2016-07-21 23:46 ` [PATCH 01/17] xfs/26[34]: remove duplicate tests Darrick J. Wong
2016-08-01 6:25 ` Christoph Hellwig
2016-07-21 23:46 ` [PATCH 02/17] xfs: use rmapbt-checking helper Darrick J. Wong
2016-08-01 6:25 ` Christoph Hellwig
2016-07-21 23:46 ` [PATCH 03/17] xfs/310: fix the size calculation for the huge device Darrick J. Wong
2016-08-01 6:25 ` Christoph Hellwig
2016-07-21 23:46 ` [PATCH 04/17] xfs/122: list the new log redo items Darrick J. Wong
2016-08-01 6:26 ` Christoph Hellwig
2016-07-21 23:46 ` [PATCH 05/17] common/reflink: actually test dedupe on scratch device Darrick J. Wong
2016-08-01 6:26 ` Christoph Hellwig
2016-07-21 23:46 ` [PATCH 06/17] xfs: run xfs_repair at the end of each test Darrick J. Wong
2016-08-01 6:27 ` Christoph Hellwig
2016-08-01 17:08 ` Darrick J. Wong
2016-08-02 12:24 ` Christoph Hellwig
2016-08-03 9:15 ` Eryu Guan
2016-08-03 22:08 ` Darrick J. Wong
2016-08-03 22:45 ` [PATCH v2 06/17] xfs: optionally test xfs_repair index rebuilding " Darrick J. Wong
2016-07-21 23:47 ` [PATCH 07/17] xfs/128: cycle_mount the scratch device, not the test device Darrick J. Wong
2016-08-01 6:27 ` Christoph Hellwig
2016-08-03 9:37 ` Eryu Guan
2016-08-03 22:09 ` Darrick J. Wong
2016-08-03 22:48 ` [PATCH v2 " Darrick J. Wong
2016-07-21 23:47 ` [PATCH 08/17] xfs/129: fix post-metadump remounting idiocy Darrick J. Wong
2016-08-01 6:27 ` Christoph Hellwig
2016-07-21 23:47 ` [PATCH 09/17] common/dmerror: fix mount option issues Darrick J. Wong
2016-08-01 6:28 ` Christoph Hellwig
2016-08-03 10:38 ` Eryu Guan
2016-08-03 22:14 ` Darrick J. Wong
2016-08-03 22:50 ` [PATCH v2 " Darrick J. Wong
2016-08-04 0:33 ` Darrick J. Wong
2016-08-04 0:34 ` [PATCH v3 " Darrick J. Wong
2016-07-21 23:47 ` [PATCH 10/17] xfs/179: use scratch device helpers Darrick J. Wong
2016-08-01 6:28 ` Christoph Hellwig
2016-07-21 23:47 ` [PATCH 11/17] xfs/234: " Darrick J. Wong
2016-08-01 6:29 ` Christoph Hellwig
2016-07-21 23:47 ` [PATCH 12/17] reflink: test cross-mountpoint reflink and dedupe Darrick J. Wong
2016-08-01 6:29 ` Christoph Hellwig
2016-08-08 7:56 ` Eryu Guan
2016-08-08 17:28 ` Darrick J. Wong
2016-07-21 23:47 ` [PATCH 13/17] xfs: test swapext with reflink Darrick J. Wong
2016-08-08 8:13 ` Eryu Guan
2016-08-08 17:41 ` Darrick J. Wong
2016-08-09 6:29 ` Dave Chinner
2016-08-19 21:53 ` Darrick J. Wong
2016-07-21 23:47 ` [PATCH 14/17] xfs: more rmapbt tests Darrick J. Wong
2016-08-08 8:48 ` Eryu Guan
2016-08-08 17:59 ` Darrick J. Wong
2016-07-21 23:47 ` Darrick J. Wong [this message]
2016-08-08 8:52 ` [PATCH 15/17] xfs: scrub fs (if still mounted) at the end of the test Eryu Guan
2016-08-08 18:03 ` Darrick J. Wong
2016-07-21 23:48 ` [PATCH 16/17] xfs/122: add the realtime rmapbt inode and btree fields Darrick J. Wong
2016-08-01 6:30 ` Christoph Hellwig
2016-07-21 23:48 ` [PATCH 17/17] xfs: test realtime rmapbt code Darrick J. Wong
2016-08-08 9:08 ` Eryu Guan
2016-08-08 18:18 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=146914487167.11762.17599617419019795848.stgit@birch.djwong.org \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).