From: "Darrick J. Wong" <djwong@kernel.org>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs <linux-xfs@vger.kernel.org>, Brian Foster <bfoster@redhat.com>
Subject: [PATCH] xfs_admin: pick up log arguments correctly
Date: Tue, 23 Mar 2021 19:10:18 -0700 [thread overview]
Message-ID: <20210324021018.GQ22100@magnolia> (raw)
From: Darrick J. Wong <djwong@kernel.org>
In commit ab9d8d69, we added support to xfs_admin to pass an external
log to xfs_db and xfs_repair. Unfortunately, we didn't do this
correctly -- by appending the log arguments to DB_OPTS, we now guarantee
an invocation of xfs_db when we don't have any work for it to do.
Brian Foster noticed that this results in xfs/764 hanging fstests
because xfs_db (when not compiled with libeditline) will wait for input
on stdin. I didn't notice because my build includes libeditline and my
test runner script does silly things with pipes such that xfs_db would
exit immediately.
Reported-by: Brian Foster <bfoster@redhat.com>
Fixes: ab9d8d69 ("xfs_admin: support adding features to V5 filesystems")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
db/xfs_admin.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/db/xfs_admin.sh b/db/xfs_admin.sh
index 916050cb..409975b2 100755
--- a/db/xfs_admin.sh
+++ b/db/xfs_admin.sh
@@ -8,7 +8,7 @@ status=0
DB_OPTS=""
REPAIR_OPTS=""
REPAIR_DEV_OPTS=""
-DB_LOG_OPTS=""
+LOG_OPTS=""
USAGE="Usage: xfs_admin [-efjlpuV] [-c 0|1] [-L label] [-O v5_feature] [-r rtdev] [-U uuid] device [logdev]"
while getopts "c:efjlL:O:pr:uU:V" c
@@ -40,19 +40,18 @@ case $# in
1|2)
# Pick up the log device, if present
if [ -n "$2" ]; then
- DB_OPTS=$DB_OPTS" -l '$2'"
- REPAIR_DEV_OPTS=$REPAIR_DEV_OPTS" -l '$2'"
+ LOG_OPTS=" -l '$2'"
fi
if [ -n "$DB_OPTS" ]
then
- eval xfs_db -x -p xfs_admin $DB_OPTS "$1"
+ eval xfs_db -x -p xfs_admin $LOG_OPTS $DB_OPTS "$1"
status=$?
fi
if [ -n "$REPAIR_OPTS" ]
then
echo "Running xfs_repair to upgrade filesystem."
- eval xfs_repair $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
+ eval xfs_repair $LOG_OPTS $REPAIR_DEV_OPTS $REPAIR_OPTS "$1"
status=`expr $? + $status`
fi
;;
next reply other threads:[~2021-03-24 2:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-24 2:10 Darrick J. Wong [this message]
2021-03-24 20:47 ` [PATCH] xfs_admin: pick up log arguments correctly Eric Sandeen
2021-03-25 4:32 ` 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=20210324021018.GQ22100@magnolia \
--to=djwong@kernel.org \
--cc=bfoster@redhat.com \
--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;
as well as URLs for NNTP newsgroup(s).