| Message ID | 161896457693.776366.7071083307521835427.stgit@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: add inode btree blocks counters to the AGI header | expand |
On Wed, Apr 21, 2021 at 3:23 AM Darrick J. Wong <djwong@kernel.org> 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 | 8 +++- > tests/xfs/910 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/910.out | 23 ++++++++++++ > tests/xfs/group | 1 + > 4 files changed, 127 insertions(+), 3 deletions(-) > create mode 100755 tests/xfs/910 > create mode 100644 tests/xfs/910.out > > > diff --git a/common/xfs b/common/xfs > index 5abc7034..3d660858 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -1153,13 +1153,15 @@ _require_xfs_repair_upgrade() > _notrun "xfs_repair does not support upgrading fs with $type" > } > > -_require_xfs_scratch_inobtcount() > +# Require that the scratch device exists, that mkfs can format with inobtcount > +# enabled, and that the kernel can mount such a filesystem. > +_require_scratch_xfs_inobtcount() > { > _require_scratch > > _scratch_mkfs -m inobtcount=1 &> /dev/null || \ > - _notrun "mkfs.xfs doesn't have inobtcount feature" > + _notrun "mkfs.xfs doesn't support inobtcount feature" > _try_scratch_mount || \ > - _notrun "inobtcount not supported by scratch filesystem type: $FSTYP" > + _notrun "kernel doesn't support xfs inobtcount feature" > _scratch_unmount > } > diff --git a/tests/xfs/910 b/tests/xfs/910 > new file mode 100755 > index 00000000..237d0a35 > --- /dev/null > +++ b/tests/xfs/910 > @@ -0,0 +1,98 @@ > +#! /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_scratch_xfs_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 > +_check_scratch_xfs_features INOBTCNT > + > +# 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 > +_check_scratch_xfs_features INOBTCNT > + > +# Format V5 filesystem without inode btree counter support and populate it. > +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full > +_scratch_mount > + > +mkdir $SCRATCH_MNT/stress > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +echo moo > $SCRATCH_MNT/urk > + > +_scratch_unmount > + > +# Upgrade filesystem to have the counters and inject failure into repair and > +# make sure that the only path forward is to re-run repair on the filesystem. > +echo "Fail partway through upgrading" > +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full > +test $? -eq 137 || echo "repair should have been killed??" > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > +_try_scratch_mount &> $tmp.mount > +res=$? > +_filter_scratch < $tmp.mount > +if [ $res -eq 0 ]; then > + echo "needsrepair should have prevented mount" > + _scratch_unmount > +fi > + > +echo "Re-run repair to finish upgrade" > +_scratch_xfs_repair 2>> $seqres.full > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > + > +echo "Filesystem should be usable again" > +_scratch_mount > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +_scratch_unmount > +_check_scratch_fs > +_check_scratch_xfs_features INOBTCNT > + > +echo "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' > + I don't think = 100 translates to = NONZERO... > +echo "Make sure we can't re-add inobtcount" > +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full > + > +echo "Mount again, look at our files" > +_scratch_mount >> $seqres.full > +cat $SCRATCH_MNT/urk > + > +status=0 > +exit > diff --git a/tests/xfs/910.out b/tests/xfs/910.out > new file mode 100644 > index 00000000..1bf040d5 > --- /dev/null > +++ b/tests/xfs/910.out > @@ -0,0 +1,23 @@ > +QA output created by 910 > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature only supported on V5 filesystems. > +FEATURES: INOBTCNT:NO > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature requires free inode btree. > +FEATURES: INOBTCNT:NO > +Fail partway through upgrading > +Adding inode btree counts to filesystem. > +FEATURES: NEEDSREPAIR:YES INOBTCNT:YES > +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. > +Re-run repair to finish upgrade > +FEATURES: NEEDSREPAIR:NO INOBTCNT:YES > +Filesystem should be usable again > +FEATURES: INOBTCNT:YES > +Make sure we have nonzero counters > +ino_blocks = NONZERO > +fino_blocks = NONZERO > +Make sure we can't re-add inobtcount > +Running xfs_repair to upgrade filesystem. > +Filesystem already has inode btree counts. > +Mount again, look at our files > +moo This test is quite rigid in the format of messages expected from xfs_repair. I suppose there is no precedent here... > diff --git a/tests/xfs/group b/tests/xfs/group > index a2309465..bd47333c 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -526,3 +526,4 @@ > 768 auto quick repair > 770 auto repair > 773 auto quick repair > +910 auto quick inobtcount > +repair? Thanks, Amir.
On Tue, Apr 20, 2021 at 05:22:57PM -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> > --- LGTM: Reviewed-by: Brian Foster <bfoster@redhat.com> > common/xfs | 8 +++- > tests/xfs/910 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/910.out | 23 ++++++++++++ > tests/xfs/group | 1 + > 4 files changed, 127 insertions(+), 3 deletions(-) > create mode 100755 tests/xfs/910 > create mode 100644 tests/xfs/910.out > > > diff --git a/common/xfs b/common/xfs > index 5abc7034..3d660858 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -1153,13 +1153,15 @@ _require_xfs_repair_upgrade() > _notrun "xfs_repair does not support upgrading fs with $type" > } > > -_require_xfs_scratch_inobtcount() > +# Require that the scratch device exists, that mkfs can format with inobtcount > +# enabled, and that the kernel can mount such a filesystem. > +_require_scratch_xfs_inobtcount() > { > _require_scratch > > _scratch_mkfs -m inobtcount=1 &> /dev/null || \ > - _notrun "mkfs.xfs doesn't have inobtcount feature" > + _notrun "mkfs.xfs doesn't support inobtcount feature" > _try_scratch_mount || \ > - _notrun "inobtcount not supported by scratch filesystem type: $FSTYP" > + _notrun "kernel doesn't support xfs inobtcount feature" > _scratch_unmount > } > diff --git a/tests/xfs/910 b/tests/xfs/910 > new file mode 100755 > index 00000000..237d0a35 > --- /dev/null > +++ b/tests/xfs/910 > @@ -0,0 +1,98 @@ > +#! /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_scratch_xfs_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 > +_check_scratch_xfs_features INOBTCNT > + > +# 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 > +_check_scratch_xfs_features INOBTCNT > + > +# Format V5 filesystem without inode btree counter support and populate it. > +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full > +_scratch_mount > + > +mkdir $SCRATCH_MNT/stress > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +echo moo > $SCRATCH_MNT/urk > + > +_scratch_unmount > + > +# Upgrade filesystem to have the counters and inject failure into repair and > +# make sure that the only path forward is to re-run repair on the filesystem. > +echo "Fail partway through upgrading" > +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full > +test $? -eq 137 || echo "repair should have been killed??" > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > +_try_scratch_mount &> $tmp.mount > +res=$? > +_filter_scratch < $tmp.mount > +if [ $res -eq 0 ]; then > + echo "needsrepair should have prevented mount" > + _scratch_unmount > +fi > + > +echo "Re-run repair to finish upgrade" > +_scratch_xfs_repair 2>> $seqres.full > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > + > +echo "Filesystem should be usable again" > +_scratch_mount > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +_scratch_unmount > +_check_scratch_fs > +_check_scratch_xfs_features INOBTCNT > + > +echo "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' > + > +echo "Make sure we can't re-add inobtcount" > +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full > + > +echo "Mount again, look at our files" > +_scratch_mount >> $seqres.full > +cat $SCRATCH_MNT/urk > + > +status=0 > +exit > diff --git a/tests/xfs/910.out b/tests/xfs/910.out > new file mode 100644 > index 00000000..1bf040d5 > --- /dev/null > +++ b/tests/xfs/910.out > @@ -0,0 +1,23 @@ > +QA output created by 910 > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature only supported on V5 filesystems. > +FEATURES: INOBTCNT:NO > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature requires free inode btree. > +FEATURES: INOBTCNT:NO > +Fail partway through upgrading > +Adding inode btree counts to filesystem. > +FEATURES: NEEDSREPAIR:YES INOBTCNT:YES > +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. > +Re-run repair to finish upgrade > +FEATURES: NEEDSREPAIR:NO INOBTCNT:YES > +Filesystem should be usable again > +FEATURES: INOBTCNT:YES > +Make sure we have nonzero counters > +ino_blocks = NONZERO > +fino_blocks = NONZERO > +Make sure we can't re-add inobtcount > +Running xfs_repair to upgrade filesystem. > +Filesystem already has inode btree counts. > +Mount again, look at our files > +moo > diff --git a/tests/xfs/group b/tests/xfs/group > index a2309465..bd47333c 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -526,3 +526,4 @@ > 768 auto quick repair > 770 auto repair > 773 auto quick repair > +910 auto quick inobtcount >
On 4/20/21 5:22 PM, 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> Seems ok to me Reviewed-by: Allison Henderson <allison.henderson@oracle.com> > --- > common/xfs | 8 +++- > tests/xfs/910 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/xfs/910.out | 23 ++++++++++++ > tests/xfs/group | 1 + > 4 files changed, 127 insertions(+), 3 deletions(-) > create mode 100755 tests/xfs/910 > create mode 100644 tests/xfs/910.out > > > diff --git a/common/xfs b/common/xfs > index 5abc7034..3d660858 100644 > --- a/common/xfs > +++ b/common/xfs > @@ -1153,13 +1153,15 @@ _require_xfs_repair_upgrade() > _notrun "xfs_repair does not support upgrading fs with $type" > } > > -_require_xfs_scratch_inobtcount() > +# Require that the scratch device exists, that mkfs can format with inobtcount > +# enabled, and that the kernel can mount such a filesystem. > +_require_scratch_xfs_inobtcount() > { > _require_scratch > > _scratch_mkfs -m inobtcount=1 &> /dev/null || \ > - _notrun "mkfs.xfs doesn't have inobtcount feature" > + _notrun "mkfs.xfs doesn't support inobtcount feature" > _try_scratch_mount || \ > - _notrun "inobtcount not supported by scratch filesystem type: $FSTYP" > + _notrun "kernel doesn't support xfs inobtcount feature" > _scratch_unmount > } > diff --git a/tests/xfs/910 b/tests/xfs/910 > new file mode 100755 > index 00000000..237d0a35 > --- /dev/null > +++ b/tests/xfs/910 > @@ -0,0 +1,98 @@ > +#! /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_scratch_xfs_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 > +_check_scratch_xfs_features INOBTCNT > + > +# 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 > +_check_scratch_xfs_features INOBTCNT > + > +# Format V5 filesystem without inode btree counter support and populate it. > +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full > +_scratch_mount > + > +mkdir $SCRATCH_MNT/stress > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +echo moo > $SCRATCH_MNT/urk > + > +_scratch_unmount > + > +# Upgrade filesystem to have the counters and inject failure into repair and > +# make sure that the only path forward is to re-run repair on the filesystem. > +echo "Fail partway through upgrading" > +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full > +test $? -eq 137 || echo "repair should have been killed??" > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > +_try_scratch_mount &> $tmp.mount > +res=$? > +_filter_scratch < $tmp.mount > +if [ $res -eq 0 ]; then > + echo "needsrepair should have prevented mount" > + _scratch_unmount > +fi > + > +echo "Re-run repair to finish upgrade" > +_scratch_xfs_repair 2>> $seqres.full > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > + > +echo "Filesystem should be usable again" > +_scratch_mount > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > +_scratch_unmount > +_check_scratch_fs > +_check_scratch_xfs_features INOBTCNT > + > +echo "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' > + > +echo "Make sure we can't re-add inobtcount" > +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full > + > +echo "Mount again, look at our files" > +_scratch_mount >> $seqres.full > +cat $SCRATCH_MNT/urk > + > +status=0 > +exit > diff --git a/tests/xfs/910.out b/tests/xfs/910.out > new file mode 100644 > index 00000000..1bf040d5 > --- /dev/null > +++ b/tests/xfs/910.out > @@ -0,0 +1,23 @@ > +QA output created by 910 > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature only supported on V5 filesystems. > +FEATURES: INOBTCNT:NO > +Running xfs_repair to upgrade filesystem. > +Inode btree count feature requires free inode btree. > +FEATURES: INOBTCNT:NO > +Fail partway through upgrading > +Adding inode btree counts to filesystem. > +FEATURES: NEEDSREPAIR:YES INOBTCNT:YES > +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. > +Re-run repair to finish upgrade > +FEATURES: NEEDSREPAIR:NO INOBTCNT:YES > +Filesystem should be usable again > +FEATURES: INOBTCNT:YES > +Make sure we have nonzero counters > +ino_blocks = NONZERO > +fino_blocks = NONZERO > +Make sure we can't re-add inobtcount > +Running xfs_repair to upgrade filesystem. > +Filesystem already has inode btree counts. > +Mount again, look at our files > +moo > diff --git a/tests/xfs/group b/tests/xfs/group > index a2309465..bd47333c 100644 > --- a/tests/xfs/group > +++ b/tests/xfs/group > @@ -526,3 +526,4 @@ > 768 auto quick repair > 770 auto repair > 773 auto quick repair > +910 auto quick inobtcount >
On Wed, Apr 21, 2021 at 08:52:39AM +0300, Amir Goldstein wrote: > On Wed, Apr 21, 2021 at 3:23 AM Darrick J. Wong <djwong@kernel.org> 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 | 8 +++- > > tests/xfs/910 | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/xfs/910.out | 23 ++++++++++++ > > tests/xfs/group | 1 + > > 4 files changed, 127 insertions(+), 3 deletions(-) > > create mode 100755 tests/xfs/910 > > create mode 100644 tests/xfs/910.out > > > > > > diff --git a/common/xfs b/common/xfs > > index 5abc7034..3d660858 100644 > > --- a/common/xfs > > +++ b/common/xfs > > @@ -1153,13 +1153,15 @@ _require_xfs_repair_upgrade() > > _notrun "xfs_repair does not support upgrading fs with $type" > > } > > > > -_require_xfs_scratch_inobtcount() > > +# Require that the scratch device exists, that mkfs can format with inobtcount > > +# enabled, and that the kernel can mount such a filesystem. > > +_require_scratch_xfs_inobtcount() <groan> I clearly changed the wrong patch in response to reviewer comments, sorry, will resubmit... > > { > > _require_scratch > > > > _scratch_mkfs -m inobtcount=1 &> /dev/null || \ > > - _notrun "mkfs.xfs doesn't have inobtcount feature" > > + _notrun "mkfs.xfs doesn't support inobtcount feature" > > _try_scratch_mount || \ > > - _notrun "inobtcount not supported by scratch filesystem type: $FSTYP" > > + _notrun "kernel doesn't support xfs inobtcount feature" > > _scratch_unmount > > } > > diff --git a/tests/xfs/910 b/tests/xfs/910 > > new file mode 100755 > > index 00000000..237d0a35 > > --- /dev/null > > +++ b/tests/xfs/910 > > @@ -0,0 +1,98 @@ > > +#! /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_scratch_xfs_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 > > +_check_scratch_xfs_features INOBTCNT > > + > > +# 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 > > +_check_scratch_xfs_features INOBTCNT > > + > > +# Format V5 filesystem without inode btree counter support and populate it. > > +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full > > +_scratch_mount > > + > > +mkdir $SCRATCH_MNT/stress > > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > > +echo moo > $SCRATCH_MNT/urk > > + > > +_scratch_unmount > > + > > +# Upgrade filesystem to have the counters and inject failure into repair and > > +# make sure that the only path forward is to re-run repair on the filesystem. > > +echo "Fail partway through upgrading" > > +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full > > +test $? -eq 137 || echo "repair should have been killed??" > > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > > +_try_scratch_mount &> $tmp.mount > > +res=$? > > +_filter_scratch < $tmp.mount > > +if [ $res -eq 0 ]; then > > + echo "needsrepair should have prevented mount" > > + _scratch_unmount > > +fi > > + > > +echo "Re-run repair to finish upgrade" > > +_scratch_xfs_repair 2>> $seqres.full > > +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT > > + > > +echo "Filesystem should be usable again" > > +_scratch_mount > > +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full > > +_scratch_unmount > > +_check_scratch_fs > > +_check_scratch_xfs_features INOBTCNT > > + > > +echo "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' > > + > > I don't think = 100 translates to = NONZERO... Urk, yes, will fix. > > +echo "Make sure we can't re-add inobtcount" > > +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full > > + > > +echo "Mount again, look at our files" > > +_scratch_mount >> $seqres.full > > +cat $SCRATCH_MNT/urk > > + > > +status=0 > > +exit > > diff --git a/tests/xfs/910.out b/tests/xfs/910.out > > new file mode 100644 > > index 00000000..1bf040d5 > > --- /dev/null > > +++ b/tests/xfs/910.out > > @@ -0,0 +1,23 @@ > > +QA output created by 910 > > +Running xfs_repair to upgrade filesystem. > > +Inode btree count feature only supported on V5 filesystems. > > +FEATURES: INOBTCNT:NO > > +Running xfs_repair to upgrade filesystem. > > +Inode btree count feature requires free inode btree. > > +FEATURES: INOBTCNT:NO > > +Fail partway through upgrading > > +Adding inode btree counts to filesystem. > > +FEATURES: NEEDSREPAIR:YES INOBTCNT:YES > > +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. > > +Re-run repair to finish upgrade > > +FEATURES: NEEDSREPAIR:NO INOBTCNT:YES > > +Filesystem should be usable again > > +FEATURES: INOBTCNT:YES > > +Make sure we have nonzero counters > > +ino_blocks = NONZERO > > +fino_blocks = NONZERO > > +Make sure we can't re-add inobtcount > > +Running xfs_repair to upgrade filesystem. > > +Filesystem already has inode btree counts. > > +Mount again, look at our files > > +moo > > This test is quite rigid in the format of messages expected from > xfs_repair. I suppose there is no precedent here... <shrug> There /is/ precedent -- if we ever need to change the stdout, we filter the golden output. --D > > > diff --git a/tests/xfs/group b/tests/xfs/group > > index a2309465..bd47333c 100644 > > --- a/tests/xfs/group > > +++ b/tests/xfs/group > > @@ -526,3 +526,4 @@ > > 768 auto quick repair > > 770 auto repair > > 773 auto quick repair > > +910 auto quick inobtcount > > > +repair? > > Thanks, > Amir.
diff --git a/common/xfs b/common/xfs index 5abc7034..3d660858 100644 --- a/common/xfs +++ b/common/xfs @@ -1153,13 +1153,15 @@ _require_xfs_repair_upgrade() _notrun "xfs_repair does not support upgrading fs with $type" } -_require_xfs_scratch_inobtcount() +# Require that the scratch device exists, that mkfs can format with inobtcount +# enabled, and that the kernel can mount such a filesystem. +_require_scratch_xfs_inobtcount() { _require_scratch _scratch_mkfs -m inobtcount=1 &> /dev/null || \ - _notrun "mkfs.xfs doesn't have inobtcount feature" + _notrun "mkfs.xfs doesn't support inobtcount feature" _try_scratch_mount || \ - _notrun "inobtcount not supported by scratch filesystem type: $FSTYP" + _notrun "kernel doesn't support xfs inobtcount feature" _scratch_unmount } diff --git a/tests/xfs/910 b/tests/xfs/910 new file mode 100755 index 00000000..237d0a35 --- /dev/null +++ b/tests/xfs/910 @@ -0,0 +1,98 @@ +#! /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_scratch_xfs_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 +_check_scratch_xfs_features INOBTCNT + +# 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 +_check_scratch_xfs_features INOBTCNT + +# Format V5 filesystem without inode btree counter support and populate it. +_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full +_scratch_mount + +mkdir $SCRATCH_MNT/stress +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full +echo moo > $SCRATCH_MNT/urk + +_scratch_unmount + +# Upgrade filesystem to have the counters and inject failure into repair and +# make sure that the only path forward is to re-run repair on the filesystem. +echo "Fail partway through upgrading" +XFS_REPAIR_FAIL_AFTER_PHASE=2 _scratch_xfs_repair -c inobtcount=1 2>> $seqres.full +test $? -eq 137 || echo "repair should have been killed??" +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT +_try_scratch_mount &> $tmp.mount +res=$? +_filter_scratch < $tmp.mount +if [ $res -eq 0 ]; then + echo "needsrepair should have prevented mount" + _scratch_unmount +fi + +echo "Re-run repair to finish upgrade" +_scratch_xfs_repair 2>> $seqres.full +_check_scratch_xfs_features NEEDSREPAIR INOBTCNT + +echo "Filesystem should be usable again" +_scratch_mount +$FSSTRESS_PROG -d $SCRATCH_MNT/stress -n 1000 >> $seqres.full +_scratch_unmount +_check_scratch_fs +_check_scratch_xfs_features INOBTCNT + +echo "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' + +echo "Make sure we can't re-add inobtcount" +_scratch_xfs_admin -O inobtcount=1 2>> $seqres.full + +echo "Mount again, look at our files" +_scratch_mount >> $seqres.full +cat $SCRATCH_MNT/urk + +status=0 +exit diff --git a/tests/xfs/910.out b/tests/xfs/910.out new file mode 100644 index 00000000..1bf040d5 --- /dev/null +++ b/tests/xfs/910.out @@ -0,0 +1,23 @@ +QA output created by 910 +Running xfs_repair to upgrade filesystem. +Inode btree count feature only supported on V5 filesystems. +FEATURES: INOBTCNT:NO +Running xfs_repair to upgrade filesystem. +Inode btree count feature requires free inode btree. +FEATURES: INOBTCNT:NO +Fail partway through upgrading +Adding inode btree counts to filesystem. +FEATURES: NEEDSREPAIR:YES INOBTCNT:YES +mount: SCRATCH_MNT: mount(2) system call failed: Structure needs cleaning. +Re-run repair to finish upgrade +FEATURES: NEEDSREPAIR:NO INOBTCNT:YES +Filesystem should be usable again +FEATURES: INOBTCNT:YES +Make sure we have nonzero counters +ino_blocks = NONZERO +fino_blocks = NONZERO +Make sure we can't re-add inobtcount +Running xfs_repair to upgrade filesystem. +Filesystem already has inode btree counts. +Mount again, look at our files +moo diff --git a/tests/xfs/group b/tests/xfs/group index a2309465..bd47333c 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -526,3 +526,4 @@ 768 auto quick repair 770 auto repair 773 auto quick repair +910 auto quick inobtcount