From: Eryu Guan <eguan@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: david@fromorbit.com, linux-btrfs@vger.kernel.org,
fstests@vger.kernel.org, xfs@oss.sgi.com
Subject: Re: [PATCH 06/17] xfs: run xfs_repair at the end of each test
Date: Wed, 3 Aug 2016 17:15:42 +0800 [thread overview]
Message-ID: <20160803091542.GM27776@eguan.usersys.redhat.com> (raw)
In-Reply-To: <146914481474.11762.2741429828012981240.stgit@birch.djwong.org>
On Thu, Jul 21, 2016 at 04:46:54PM -0700, Darrick J. Wong wrote:
> Run xfs_repair twice at the end of each test -- once to rebuild
> the btree indices, and again with -n to check the rebuild work.
Seems like it's two more xfs_repair, three in total :)
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> README | 4 ++++
> common/rc | 30 ++++++++++++++++++++++++++++++
> 2 files changed, 34 insertions(+)
>
>
> diff --git a/README b/README
> index 2647e12..4509cc1 100644
> --- a/README
> +++ b/README
> @@ -80,6 +80,10 @@ Preparing system for tests (IRIX and Linux):
> added to the end of fsstresss and fsx invocations, respectively,
> in case you wish to exclude certain operational modes from these
> tests.
> + - set TEST_XFS_REPAIR_REBUILD=1 to have _check_xfs_filesystem
> + 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.
>
> - or add a case to the switch in common/config assigning
> these variables based on the hostname of your test
> diff --git a/common/rc b/common/rc
> index 7c79bf8..3b45578 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2428,6 +2428,36 @@ _check_xfs_filesystem()
> ok=0
> fi
>
> + if [ -n "$TEST_XFS_REPAIR_REBUILD" ]; then
> + $XFS_REPAIR_PROG -n $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
> + if [ $? -ne 0 ]
> + then
> + echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $seqres.full)"
> +
> + echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$seqres.full
> + echo "*** xfs_repair -n output ***" >>$seqres.full
> + cat $tmp.repair | _fix_malloc >>$seqres.full
> + echo "*** end xfs_repair output" >>$seqres.full
> +
> + ok=0
> + fi
> + rm -f $tmp.fs_check $tmp.logprint $tmp.repair
> +
> + $XFS_REPAIR_PROG $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
> + if [ $? -ne 0 ]
> + then
> + echo "_check_xfs_filesystem: filesystem on $device is inconsistent (r) (see $seqres.full)"
> +
> + echo "_check_xfs_filesystem: filesystem on $device is inconsistent" >>$seqres.full
> + echo "*** xfs_repair -n output ***" >>$seqres.full
> + cat $tmp.repair | _fix_malloc >>$seqres.full
> + echo "*** end xfs_repair output" >>$seqres.full
> +
> + ok=0
> + fi
> + rm -f $tmp.fs_check $tmp.logprint $tmp.repair
> + fi
> +
I think we can move this hunk after the original xfs_repair and swap the
xfs_repair order, i.e.
xfs_repair -n # this is the original repair check
if <check_rebuild>; then
xfs_repair # do rebuild without -n
xfs_repair -n # check rebuild result
fi
This seems more clear to me and we can mark which repair is failing more
easily (right now the three xfs_repairs are all marked as "(r)", it's
hard to say which one is failing), e.g.
xfs_repair -n # marked as "(r)", means "repair"
if <check_rebuild>; then
xfs_repair # mark as "(rb)", means "rebuild"?
xfs_repair -n # mark as "(rr)", means "repair rebuild"?
fi
Thanks,
Eryu
> $XFS_REPAIR_PROG -n $extra_options $extra_log_options $extra_rt_options $device >$tmp.repair 2>&1
> if [ $? -ne 0 ]
> then
>
next prev parent reply other threads:[~2016-08-03 9:15 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 [this message]
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 ` [PATCH 15/17] xfs: scrub fs (if still mounted) at the end of the test Darrick J. Wong
2016-08-08 8:52 ` 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=20160803091542.GM27776@eguan.usersys.redhat.com \
--to=eguan@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.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).