From: "Darrick J. Wong" <djwong@kernel.org>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>
Subject: [PATCH] xfs_admin: don't hide the xfs_repair output when upgrading
Date: Fri, 5 Mar 2021 14:00:21 -0800 [thread overview]
Message-ID: <20210305220021.GI3419940@magnolia> (raw)
From: Darrick J. Wong <djwong@kernel.org>
Currently, xfs_admin suppresses the output from xfs_repair when it tries
to upgrade a filesystem, and prints a rather unhelpful message if the
upgrade fails.
Neither of these behaviors are useful -- repair can fail for reasons
outside of the filesystem being mounted, and if it does, the admin will
never know what actually happened.
Worse yet, if repair finds corruptions on disk, the upgrade script
silently throws all that away, which means that nobody will ever be able
to report what happened if an upgrade trashes a filesystem.
Therefore, allow the console to capture all of repair's stdout/stderr
reports.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
db/xfs_admin.sh | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 02f34b73..916050cb 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -51,17 +51,9 @@ case $# in
fi
if [ -n "$REPAIR_OPTS" ]
then
- # Hide normal repair output which is sent to stderr
- # assuming the filesystem is fine when a user is
- # running xfs_admin.
- # Ideally, we need to improve the output behaviour
- # of repair for this purpose (say a "quiet" mode).
- eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1" 2> /dev/null
+ echo "Running xfs_repair to upgrade filesystem."
+ eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
status=`expr $? + $status`
- if [ $status -ne 0 ]
- then
- echo "Conversion failed, is the filesystem unmounted?"
- fi
fi
;;
*) echo $USAGE 1>&2
next reply other threads:[~2021-03-05 22:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-05 22:00 Darrick J. Wong [this message]
2021-03-08 12:17 ` [PATCH] xfs_admin: don't hide the xfs_repair output when upgrading Brian Foster
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=20210305220021.GI3419940@magnolia \
--to=djwong@kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@redhat.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