All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: eguan@redhat.com, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: [PATCH 3/6] common/xfs: standardize the xfs_scrub output that gets recorded to $seqres.full
Date: Wed, 25 Oct 2017 22:51:51 -0700	[thread overview]
Message-ID: <150899711189.18389.16271824732883945941.stgit@magnolia> (raw)
In-Reply-To: <150899709935.18389.17266737014565285073.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

Make the xfs_scrub output that gets recorded to $seqres.full follow the
format of xfs_repair checks.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 common/xfs |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)


diff --git a/common/xfs b/common/xfs
index df7d029..25c2ce9 100644
--- a/common/xfs
+++ b/common/xfs
@@ -356,11 +356,15 @@ _check_xfs_filesystem()
 	# Run online scrub if we can.
 	mntpt="$(_is_mounted $device)"
 	if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then
-		"$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full 2>&1
+		"$XFS_SCRUB_PROG" $scrubflag -v -d -n $device > $tmp.scrub 2>&1
 		if [ $? -ne 0 ]; then
-			_log_err "filesystem on $device failed scrub"
+			_log_err "_check_xfs_filesystem: filesystem on $device failed scrub"
+			echo "*** xfs_scrub $scrubflag -v -d -n output ***" >> $seqres.full
+			cat $tmp.scrub >> $seqres.full
+			echo "*** end xfs_scrub output" >> $serqres.full
 			ok=0
 		fi
+		rm -f $tmp.scrub
 	fi
 
 	if [ "$type" = "xfs" ]; then


  parent reply	other threads:[~2017-10-26  5:51 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-26  5:51 [PATCH 1/6] quota: clear speculative delalloc when checking quota usage Darrick J. Wong
2017-10-26  5:51 ` [PATCH 2/6] common/xfs: refactor xfs_scrub presence testing Darrick J. Wong
2017-10-27  4:37   ` Eryu Guan
2017-10-27 18:04     ` Darrick J. Wong
2017-10-27 20:21   ` [PATCH v2 " Darrick J. Wong
2017-10-26  5:51 ` Darrick J. Wong [this message]
2017-10-26  5:51 ` [PATCH 4/6] generic/45[34]: force UTF-8 codeset to enable utf-8 namer checks in xfs_scrub Darrick J. Wong
2017-10-26  5:52 ` [PATCH 5/6] misc: add module reloading helpers Darrick J. Wong
2017-10-26  6:43   ` Eryu Guan
2017-10-27  0:35     ` Darrick J. Wong
2017-10-27  0:38   ` [PATCH v2 " Darrick J. Wong
2017-10-27  4:41     ` Eryu Guan
2017-10-27 18:18       ` Darrick J. Wong
2017-10-28  5:47         ` Eryu Guan
2017-10-27 20:23   ` [PATCH v3 " Darrick J. Wong
2017-10-26  5:52 ` [PATCH 6/6] xfs: test that we don't leak inodes and dquots during failed cow recovery Darrick J. Wong
2017-10-27  0:42   ` [PATCH v2 " Darrick J. Wong
2017-10-27  0:43 ` [PATCH 7/6] common/fuzzy: online re-scrub should not preen Darrick J. Wong
2017-10-27  0:44 ` [PATCH 8/6] xfs/333: fix errors with new inode pointer verifiers Darrick J. Wong
2017-10-27  6:04   ` Eryu Guan
2017-10-27 18:21     ` Darrick J. Wong
2017-10-27 20:24   ` [PATCH v2 " Darrick J. Wong
2017-11-01 21:13     ` Darrick J. Wong
2017-10-27  0:44 ` [PATCH 9/6] generic/459: fix test running errors Darrick J. Wong
2017-10-27  4:42   ` Eryu Guan
2017-10-27 18:22     ` Darrick J. Wong
2017-10-27 20:25   ` [PATCH v2 " Darrick J. Wong
2017-10-28 17:07     ` Darrick J. Wong
2017-10-28 17:08   ` [PATCH v3 " Darrick J. Wong
2017-10-30  5:01     ` Eryu Guan
2017-10-27 20:25 ` [PATCH 10/6] common/xfs: remove inode-paths cruft Darrick J. Wong
2017-10-30  5:00   ` Eryu Guan

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=150899711189.18389.16271824732883945941.stgit@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=eguan@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.