From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: guaneryu@gmail.com, linux-xfs@vger.kernel.org,
fstests@vger.kernel.org, guan@eryu.me
Subject: Re: [PATCH 3/3] xfs: test inobtcount upgrade
Date: Tue, 23 Mar 2021 10:13:25 -0400 [thread overview]
Message-ID: <YFn3hck7nYCwhfK3@bfoster> (raw)
In-Reply-To: <161647326120.3431131.9588272913557202987.stgit@magnolia>
On Mon, Mar 22, 2021 at 09:21:01PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
>
> Make sure we can actually upgrade filesystems to support inode btree
> counters.
>
> Signed-off-by: Darrick J. Wong <djwong@kernel.org>
> ---
> common/xfs | 20 ++++++
> tests/xfs/764 | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/764.out | 27 ++++++++
> tests/xfs/910 | 84 +++++++++++++++++++++++
> tests/xfs/910.out | 12 +++
> tests/xfs/group | 2 +
> 6 files changed, 335 insertions(+)
> create mode 100755 tests/xfs/764
> create mode 100644 tests/xfs/764.out
> create mode 100755 tests/xfs/910
> create mode 100644 tests/xfs/910.out
>
>
> diff --git a/common/xfs b/common/xfs
> index 9cb373ba..a316f384 100644
> --- a/common/xfs
> +++ b/common/xfs
> @@ -1085,3 +1085,23 @@ _require_xfs_copy()
> [ "$USE_EXTERNAL" = yes ] && \
> _notrun "Cannot xfs_copy with external devices"
> }
> +
> +_require_xfs_repair_upgrade()
> +{
> + local type="$1"
> +
> + $XFS_REPAIR_PROG -c "$type=narf" 2>&1 | \
narf?
> + grep -q 'unknown option' && \
> + _notrun "xfs_repair does not support upgrading fs with $type"
> +}
> +
> +_require_xfs_scratch_inobtcount()
> +{
> + _require_scratch
> +
> + _scratch_mkfs -m inobtcount=1 &> /dev/null || \
> + _notrun "mkfs.xfs doesn't have inobtcount feature"
> + _try_scratch_mount || \
> + _notrun "inobtcount not supported by scratch filesystem type: $FSTYP"
> + _scratch_unmount
> +}
> diff --git a/tests/xfs/764 b/tests/xfs/764
> new file mode 100755
> index 00000000..cf6784d2
> --- /dev/null
> +++ b/tests/xfs/764
> @@ -0,0 +1,190 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +# Copyright (c) 2021 Oracle. All Rights Reserved.
> +#
> +# FS QA Test No. 764
> +#
> +# Functional testing for xfs_admin -O, which is a new switch that enables us to
> +# add features to an existing filesystem. In these test scenarios, we try to
> +# add the inode btree counter 'feature' to the filesystem, and make sure that
> +# NEEDSREPAIR (aka the thing that prevents us from mounting after an upgrade
> +# fails) is clear if the upgraded succeeds and set if it fails.
> +#
> +# The first scenario tests that we can't add inobtcount to the V4 format,
> +# which is now deprecated.
> +#
> +# The middle five scenarios ensure that xfs_admin -O works even when external
> +# log devices and realtime volumes are specified. This part is purely an
> +# exerciser for the userspace tools; kernel support for those features is not
> +# required.
> +#
> +# The last scenario uses a xfs_repair debug knob to simulate failure during an
> +# inobtcount upgrade, then checks that mounts fail when the flag is enabled,
> +# that repair clears the flag, and mount works after repair.
> +
By and large the test seems reasonable, though it hangs somewhere in
xfs_db for me on a quick run, not sure why. The runtime state is as
follows:
# ps | grep xfs_db:
... xfs_db -x -p xfs_admin -l /mnt/test/scratch.log /dev/mapper/test-scratch
# cat /proc/12489/stack
[<0>] wait_woken+0x67/0x80
[<0>] n_tty_read+0x4f9/0x5c0
[<0>] tty_read+0x135/0x240
[<0>] new_sync_read+0x105/0x180
[<0>] vfs_read+0x14b/0x1a0
[<0>] ksys_read+0x4f/0xc0
[<0>] do_syscall_64+0x33/0x40
[<0>] entry_SYSCALL_64_after_hwframe+0x44/0xa9
# cat /tmp/11671.out
QA output created by 764
S1: Cannot add inobtcount to a V4 fs
Running xfs_repair to upgrade filesystem.
Inode btree count feature only supported on V5 filesystems.
S2: Check that setting with xfs_admin + logdev works
Looks like xfs_db might be waiting for input on the terminal..?
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.* $fake_logfile $fake_rtfile
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# real QA test starts here
> +_supported_fs xfs
> +_require_test
> +_require_xfs_scratch_inobtcount
> +_require_command "$XFS_ADMIN_PROG" "xfs_admin"
> +_require_xfs_repair_upgrade inobtcount
> +
> +rm -f $seqres.full
> +
> +note() {
> + echo "$@" | tee -a $seqres.full
> +}
> +
> +note "S1: Cannot add inobtcount to a V4 fs"
> +_scratch_mkfs -m crc=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +
> +# Middle five scenarios: Make sure upgrades work with various external device
> +# configurations.
> +note "S2: Check that setting with xfs_admin + logdev works"
> +fake_logfile=$TEST_DIR/scratch.log
> +rm -f $fake_logfile
> +truncate -s 500m $fake_logfile
> +
> +old_external=$USE_EXTERNAL
> +old_logdev=$SCRATCH_LOGDEV
> +USE_EXTERNAL=yes
> +SCRATCH_LOGDEV=$fake_logfile
> +
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_admin should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +
> +note "Check clean"
> +_scratch_xfs_repair -n &>> $seqres.full || echo "Check failed?"
> +
> +USE_EXTERNAL=$old_external
> +SCRATCH_LOGDEV=$old_logdev
> +
> +note "S3: Check that setting with xfs_admin + realtime works"
> +fake_rtfile=$TEST_DIR/scratch.rt
> +rm -f $fake_rtfile
> +truncate -s 500m $fake_rtfile
> +
> +old_external=$USE_EXTERNAL
> +old_rtdev=$SCRATCH_RTDEV
> +USE_EXTERNAL=yes
> +SCRATCH_RTDEV=$fake_rtfile
> +
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_admin should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +
> +note "Check clean"
> +_scratch_xfs_repair -n &>> $seqres.full || echo "Check failed?"
> +
> +USE_EXTERNAL=$old_external
> +SCRATCH_RTDEV=$old_rtdev
> +
> +note "S4: Check that setting with xfs_admin + realtime + logdev works"
> +old_external=$USE_EXTERNAL
> +old_logdev=$SCRATCH_LOGDEV
> +old_rtdev=$SCRATCH_RTDEV
> +USE_EXTERNAL=yes
> +SCRATCH_LOGDEV=$fake_logfile
> +SCRATCH_RTDEV=$fake_rtfile
> +
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_admin should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +
> +note "Check clean"
> +_scratch_xfs_repair -n &>> $seqres.full || echo "Check failed?"
> +
> +USE_EXTERNAL=$old_external
> +SCRATCH_LOGDEV=$old_logdev
> +SCRATCH_RTDEV=$old_rtdev
> +
> +note "S5: Check that setting with xfs_admin + nortdev + nologdev works"
> +old_external=$USE_EXTERNAL
> +old_logdev=$SCRATCH_LOGDEV
> +old_rtdev=$SCRATCH_RTDEV
> +USE_EXTERNAL=
> +SCRATCH_LOGDEV=
> +SCRATCH_RTDEV=
> +
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_admin should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +
> +note "Check clean"
> +_scratch_xfs_repair -n &>> $seqres.full || echo "Check failed?"
> +
> +USE_EXTERNAL=$old_external
> +SCRATCH_LOGDEV=$old_logdev
> +SCRATCH_RTDEV=$old_rtdev
> +
There's a lot of eye crossing copy-paste going on here. Do we really
need to always test these varying configurations? My general expectation
for fstests has always been to primarily test the configuration
specified in the config file. ISTM this test could be legitimately
reduced to S1, S6 and S7. That might also mitigate the need for 'note'
markers in the golden output, fwiw.
> +# Run our test with the test runner's config last so that the post-test check
> +# won't trip over our artificial log/rt devices
> +note "S6: Check that setting with xfs_admin testrunner config works"
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_admin should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +
Perhaps the above xfs_db commands could be wrapped in a helper that
filters on the expected version values..? I.e., even something really
simple that executed the grep and manually constructed a string would
improve readability:
_filter_version()
{
str="version "
_scratch_xfs_db -c "version" | grep -q $1 &&
str="$str $1"
echo $str
}
_scratch_mkfs ...
_scratch_xfs_admin ...
_filter_version NEEDSREPAIR
_filter_version INOBTCNT
Then the test dumps the filter output directly to the golden output such
that there's no need for '&& echo "didn't expect this"' logic on every
test.
> +note "Check clean"
> +_scratch_xfs_repair -n &>> $seqres.full || echo "Check failed?"
> +
> +note "S7: Simulate failure during upgrade process"
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full
> +test $? -eq 137 || echo "repair should have been killed??"
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR || \
> + echo "needsrepair should have been set on fs"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "inobtcount should have been set on fs"
> +_try_scratch_mount &> $tmp.mount
> +res=$?
> +_filter_scratch < $tmp.mount
> +if [ $res -eq 0 ]; then
> + echo "needsrepair should have prevented mount"
> + _scratch_unmount
> +fi
> +_scratch_xfs_repair 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q NEEDSREPAIR && \
> + echo "xfs_repair should have cleared needsrepair?"
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "xfs_admin should have set inobtcount?"
> +_scratch_mount
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/764.out b/tests/xfs/764.out
> new file mode 100644
> index 00000000..067639c9
> --- /dev/null
> +++ b/tests/xfs/764.out
> @@ -0,0 +1,27 @@
> +QA output created by 764
> +S1: Cannot add inobtcount to a V4 fs
> +Running xfs_repair to upgrade filesystem.
> +Inode btree count feature only supported on V5 filesystems.
> +S2: Check that setting with xfs_admin + logdev works
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +Check clean
> +S3: Check that setting with xfs_admin + realtime works
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +Check clean
> +S4: Check that setting with xfs_admin + realtime + logdev works
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +Check clean
> +S5: Check that setting with xfs_admin + nortdev + nologdev works
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +Check clean
> +S6: Check that setting with xfs_admin testrunner config works
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +Check clean
> +S7: Simulate failure during upgrade process
> +Adding inode btree counts to filesystem.
> +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning.
> diff --git a/tests/xfs/910 b/tests/xfs/910
> new file mode 100755
> index 00000000..4bf79db2
> --- /dev/null
> +++ b/tests/xfs/910
> @@ -0,0 +1,84 @@
> +#! /bin/bash
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +# Copyright (c) 2021 Oracle. All Rights Reserved.
> +#
> +# FS QA Test No. 910
> +#
> +# Check that we can upgrade a filesystem to support inobtcount and that
> +# everything works properly after the upgrade.
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + cd /
> + rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# real QA test starts here
> +_supported_fs xfs
> +_require_xfs_scratch_inobtcount
> +_require_command "$XFS_ADMIN_PROG" "xfs_admin"
> +_require_xfs_repair_upgrade inobtcount
> +
> +rm -f $seqres.full
> +
> +# Make sure we can't format a filesystem with inobtcount and not finobt.
> +_scratch_mkfs -m crc=1,inobtcount=1,finobt=0 &> $seqres.full && \
> + echo "Should not be able to format with inobtcount but not finobt."
> +
> +# Make sure we can't upgrade a V4 filesystem
> +_scratch_mkfs -m crc=0,inobtcount=0,finobt=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT && \
> + echo "Should not be able to upgrade to inobtcount without V5."
> +
> +# Make sure we can't upgrade a filesystem to inobtcount without finobt.
> +_scratch_mkfs -m crc=1,inobtcount=0,finobt=0 >> $seqres.full
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT && \
> + echo "Should not be able to upgrade to inobtcount without finobt."
> +
> +# Format V5 filesystem without inode btree counter support and populate it
> +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
> +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full
> +_scratch_mount >> $seqres.full
> +
> +echo moo > $SCRATCH_MNT/urk
> +
> +_scratch_unmount
> +_check_scratch_fs
> +
> +# Now upgrade to inobtcount support
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_xfs_db -c 'version' | grep -q INOBTCNT || \
> + echo "Cannot detect new feature?"
> +_check_scratch_fs
> +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' -c 'agi 0' -c 'p' >> $seqres.full
> +
Isn't this essentially the same core feature upgrade test as 764 with
some minor additional logic (i.e., create a file, check counters)? From
the group update below it seems like maybe 764 is intended to be a
generic repair test while this is intended to target inobtcount, but
there seems to be quite a lot of overlap here...
Brian
> +# Make sure we have nonzero counters
> +_scratch_xfs_db -c 'agi 0' -c 'print ino_blocks fino_blocks' | \
> + sed -e 's/= [1-9]*/= NONZERO/g'
> +
> +# Mount again, look at our files
> +_scratch_mount >> $seqres.full
> +cat $SCRATCH_MNT/urk
> +
> +# Make sure we can't re-add inobtcount
> +_scratch_unmount
> +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
> +_scratch_mount >> $seqres.full
> +
> +status=0
> +exit
> diff --git a/tests/xfs/910.out b/tests/xfs/910.out
> new file mode 100644
> index 00000000..c3cfbb80
> --- /dev/null
> +++ b/tests/xfs/910.out
> @@ -0,0 +1,12 @@
> +QA output created by 910
> +Running xfs_repair to upgrade filesystem.
> +Inode btree count feature only supported on V5 filesystems.
> +Running xfs_repair to upgrade filesystem.
> +Inode btree count feature requires free inode btree.
> +Running xfs_repair to upgrade filesystem.
> +Adding inode btree counts to filesystem.
> +ino_blocks = NONZERO
> +fino_blocks = NONZERO
> +moo
> +Running xfs_repair to upgrade filesystem.
> +Filesystem already has inode btree counts.
> diff --git a/tests/xfs/group b/tests/xfs/group
> index 6aa7883e..28176409 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -517,7 +517,9 @@
> 538 auto stress
> 759 auto quick rw realtime
> 760 auto quick rw realtime collapse insert unshare zero prealloc
> +764 auto quick repair
> 768 auto quick repair
> 770 auto repair
> +910 auto quick inobtcount
> 917 auto quick db
> 918 auto quick db
>
next prev parent reply other threads:[~2021-03-23 14:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 4:20 [PATCHSET 0/3] fstests: add inode btree blocks counters to the AGI header Darrick J. Wong
2021-03-23 4:20 ` [PATCH 1/3] xfs/{010,030}: update repair output to deal with inobtcount feature Darrick J. Wong
2021-03-23 4:20 ` [PATCH 2/3] xfs/122: embiggen struct xfs_agi size for " Darrick J. Wong
2021-03-23 4:21 ` [PATCH 3/3] xfs: test inobtcount upgrade Darrick J. Wong
2021-03-23 14:13 ` Brian Foster [this message]
2021-03-23 18:54 ` Darrick J. Wong
2021-03-24 12:57 ` Brian Foster
2021-03-26 2:36 ` Darrick J. Wong
2021-03-27 14:35 ` Brian Foster
2021-03-28 15:12 ` Eryu Guan
2021-03-28 15:14 ` [PATCHSET 0/3] fstests: add inode btree blocks counters to the AGI header Eryu Guan
-- strict thread matches above, loose matches on Subject: below --
2021-02-13 5:33 [PATCHSET RFC " Darrick J. Wong
2021-02-13 5:33 ` [PATCH 3/3] xfs: test inobtcount upgrade 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=YFn3hck7nYCwhfK3@bfoster \
--to=bfoster@redhat.com \
--cc=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=guan@eryu.me \
--cc=guaneryu@gmail.com \
--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.