| Message ID | 20230709223750.GC11456@frogsfrogsfrogs (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | misc: remove bogus fstest | expand |
On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Remove this test, not sure why it was committed... Huh? I don't see it on for-next. What am I missing? Thanks- Bill > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/xfs/999 | 66 ----------------------------------------------------- > tests/xfs/999.out | 15 ------------ > 2 files changed, 81 deletions(-) > delete mode 100755 tests/xfs/999 > delete mode 100644 tests/xfs/999.out > > diff --git a/tests/xfs/999 b/tests/xfs/999 > deleted file mode 100755 > index 9e799f66e72..00000000000 > --- a/tests/xfs/999 > +++ /dev/null > @@ -1,66 +0,0 @@ > -#! /bin/bash > -# SPDX-License-Identifier: GPL-2.0 > -# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. > -# > -# FS QA Test 521 > -# > -# Test xfs_repair's progress reporting > -# > -. ./common/preamble > -_begin_fstest auto repair > - > -# Override the default cleanup function. > -_cleanup() > -{ > - cd / > - rm -f $tmp.* > - _cleanup_delay > /dev/null 2>&1 > -} > - > -# Import common functions. > -. ./common/filter > -. ./common/dmdelay > -. ./common/populate > - > -# real QA test starts here > - > -# Modify as appropriate. > -_supported_fs xfs > -_require_scratch > -_require_dm_target delay > - > -# Filter output specific to the formatters in xfs_repair/progress.c > -# Ideally we'd like to see hits on anything that matches > -# awk '/{FMT/' xfsprogs-dev/repair/progress.c > -filter_repair() > -{ > - sed -nre ' > - s/[0-9]+/#/g; > - s/^\s+/ /g; > - s/(# (week|day|hour|minute|second)s?(, )?)+/{progres}/g; > - /#:#:#:/p > - ' > -} > - > -echo "Format and populate" > -_scratch_populate_cached nofill > $seqres.full 2>&1 > - > -echo "Introduce a dmdelay" > -_init_delay > -DELAY_MS=38 > - > -# Introduce a read I/O delay > -# The default in common/dmdelay is a bit too agressive > -BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` > -DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 $DELAY_MS" > -_load_delay_table $DELAY_READ > - > -echo "Run repair" > -SCRATCH_DEV=$DELAY_DEV _scratch_xfs_repair -o ag_stride=4 -t 1 2>&1 | > - tee -a $seqres.full > $tmp.repair > - > -cat $tmp.repair | filter_repair | sort -u > - > -# success, all done > -status=0 > -exit > diff --git a/tests/xfs/999.out b/tests/xfs/999.out > deleted file mode 100644 > index e27534d8de6..00000000000 > --- a/tests/xfs/999.out > +++ /dev/null > @@ -1,15 +0,0 @@ > -QA output created by 999 > -Format and populate > -Introduce a dmdelay > -Run repair > - - #:#:#: Phase #: #% done - estimated remaining time {progres} > - - #:#:#: Phase #: elapsed time {progres} - processed # inodes per minute > - - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done > - - #:#:#: process known inodes and inode discovery - # of # inodes done > - - #:#:#: process newly discovered inodes - # of # allocation groups done > - - #:#:#: rebuild AG headers and trees - # of # allocation groups done > - - #:#:#: scanning agi unlinked lists - # of # allocation groups done > - - #:#:#: scanning filesystem freespace - # of # allocation groups done > - - #:#:#: setting up duplicate extent list - # of # allocation groups done > - - #:#:#: verify and correct link counts - # of # allocation groups done > - - #:#:#: zeroing log - # of # blocks done >
On Mon, Jul 10, 2023 at 02:16:56PM -0500, Bill O'Donnell wrote: > On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > Remove this test, not sure why it was committed... > > Huh? I don't see it on for-next. What am I missing? Oops, I should've mentioned this is xfsprogs for-next. https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/tests/xfs?h=for-next --D > Thanks- > Bill > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > --- > > tests/xfs/999 | 66 ----------------------------------------------------- > > tests/xfs/999.out | 15 ------------ > > 2 files changed, 81 deletions(-) > > delete mode 100755 tests/xfs/999 > > delete mode 100644 tests/xfs/999.out > > > > diff --git a/tests/xfs/999 b/tests/xfs/999 > > deleted file mode 100755 > > index 9e799f66e72..00000000000 > > --- a/tests/xfs/999 > > +++ /dev/null > > @@ -1,66 +0,0 @@ > > -#! /bin/bash > > -# SPDX-License-Identifier: GPL-2.0 > > -# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. > > -# > > -# FS QA Test 521 > > -# > > -# Test xfs_repair's progress reporting > > -# > > -. ./common/preamble > > -_begin_fstest auto repair > > - > > -# Override the default cleanup function. > > -_cleanup() > > -{ > > - cd / > > - rm -f $tmp.* > > - _cleanup_delay > /dev/null 2>&1 > > -} > > - > > -# Import common functions. > > -. ./common/filter > > -. ./common/dmdelay > > -. ./common/populate > > - > > -# real QA test starts here > > - > > -# Modify as appropriate. > > -_supported_fs xfs > > -_require_scratch > > -_require_dm_target delay > > - > > -# Filter output specific to the formatters in xfs_repair/progress.c > > -# Ideally we'd like to see hits on anything that matches > > -# awk '/{FMT/' xfsprogs-dev/repair/progress.c > > -filter_repair() > > -{ > > - sed -nre ' > > - s/[0-9]+/#/g; > > - s/^\s+/ /g; > > - s/(# (week|day|hour|minute|second)s?(, )?)+/{progres}/g; > > - /#:#:#:/p > > - ' > > -} > > - > > -echo "Format and populate" > > -_scratch_populate_cached nofill > $seqres.full 2>&1 > > - > > -echo "Introduce a dmdelay" > > -_init_delay > > -DELAY_MS=38 > > - > > -# Introduce a read I/O delay > > -# The default in common/dmdelay is a bit too agressive > > -BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` > > -DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 $DELAY_MS" > > -_load_delay_table $DELAY_READ > > - > > -echo "Run repair" > > -SCRATCH_DEV=$DELAY_DEV _scratch_xfs_repair -o ag_stride=4 -t 1 2>&1 | > > - tee -a $seqres.full > $tmp.repair > > - > > -cat $tmp.repair | filter_repair | sort -u > > - > > -# success, all done > > -status=0 > > -exit > > diff --git a/tests/xfs/999.out b/tests/xfs/999.out > > deleted file mode 100644 > > index e27534d8de6..00000000000 > > --- a/tests/xfs/999.out > > +++ /dev/null > > @@ -1,15 +0,0 @@ > > -QA output created by 999 > > -Format and populate > > -Introduce a dmdelay > > -Run repair > > - - #:#:#: Phase #: #% done - estimated remaining time {progres} > > - - #:#:#: Phase #: elapsed time {progres} - processed # inodes per minute > > - - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done > > - - #:#:#: process known inodes and inode discovery - # of # inodes done > > - - #:#:#: process newly discovered inodes - # of # allocation groups done > > - - #:#:#: rebuild AG headers and trees - # of # allocation groups done > > - - #:#:#: scanning agi unlinked lists - # of # allocation groups done > > - - #:#:#: scanning filesystem freespace - # of # allocation groups done > > - - #:#:#: setting up duplicate extent list - # of # allocation groups done > > - - #:#:#: verify and correct link counts - # of # allocation groups done > > - - #:#:#: zeroing log - # of # blocks done > > >
On 2023-07-09 15:37:50, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Remove this test, not sure why it was committed... > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/xfs/999 | 66 ----------------------------------------------------- > tests/xfs/999.out | 15 ------------ huh Reviewed-by: Andrey Albershteyn <aalbersh@redhat.com>
On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Remove this test, not sure why it was committed... > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Bill O'Donnell <bodonnel@redhat.com> > --- > tests/xfs/999 | 66 ----------------------------------------------------- > tests/xfs/999.out | 15 ------------ > 2 files changed, 81 deletions(-) > delete mode 100755 tests/xfs/999 > delete mode 100644 tests/xfs/999.out > > diff --git a/tests/xfs/999 b/tests/xfs/999 > deleted file mode 100755 > index 9e799f66e72..00000000000 > --- a/tests/xfs/999 > +++ /dev/null > @@ -1,66 +0,0 @@ > -#! /bin/bash > -# SPDX-License-Identifier: GPL-2.0 > -# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. > -# > -# FS QA Test 521 > -# > -# Test xfs_repair's progress reporting > -# > -. ./common/preamble > -_begin_fstest auto repair > - > -# Override the default cleanup function. > -_cleanup() > -{ > - cd / > - rm -f $tmp.* > - _cleanup_delay > /dev/null 2>&1 > -} > - > -# Import common functions. > -. ./common/filter > -. ./common/dmdelay > -. ./common/populate > - > -# real QA test starts here > - > -# Modify as appropriate. > -_supported_fs xfs > -_require_scratch > -_require_dm_target delay > - > -# Filter output specific to the formatters in xfs_repair/progress.c > -# Ideally we'd like to see hits on anything that matches > -# awk '/{FMT/' xfsprogs-dev/repair/progress.c > -filter_repair() > -{ > - sed -nre ' > - s/[0-9]+/#/g; > - s/^\s+/ /g; > - s/(# (week|day|hour|minute|second)s?(, )?)+/{progres}/g; > - /#:#:#:/p > - ' > -} > - > -echo "Format and populate" > -_scratch_populate_cached nofill > $seqres.full 2>&1 > - > -echo "Introduce a dmdelay" > -_init_delay > -DELAY_MS=38 > - > -# Introduce a read I/O delay > -# The default in common/dmdelay is a bit too agressive > -BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` > -DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 $DELAY_MS" > -_load_delay_table $DELAY_READ > - > -echo "Run repair" > -SCRATCH_DEV=$DELAY_DEV _scratch_xfs_repair -o ag_stride=4 -t 1 2>&1 | > - tee -a $seqres.full > $tmp.repair > - > -cat $tmp.repair | filter_repair | sort -u > - > -# success, all done > -status=0 > -exit > diff --git a/tests/xfs/999.out b/tests/xfs/999.out > deleted file mode 100644 > index e27534d8de6..00000000000 > --- a/tests/xfs/999.out > +++ /dev/null > @@ -1,15 +0,0 @@ > -QA output created by 999 > -Format and populate > -Introduce a dmdelay > -Run repair > - - #:#:#: Phase #: #% done - estimated remaining time {progres} > - - #:#:#: Phase #: elapsed time {progres} - processed # inodes per minute > - - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done > - - #:#:#: process known inodes and inode discovery - # of # inodes done > - - #:#:#: process newly discovered inodes - # of # allocation groups done > - - #:#:#: rebuild AG headers and trees - # of # allocation groups done > - - #:#:#: scanning agi unlinked lists - # of # allocation groups done > - - #:#:#: scanning filesystem freespace - # of # allocation groups done > - - #:#:#: setting up duplicate extent list - # of # allocation groups done > - - #:#:#: verify and correct link counts - # of # allocation groups done > - - #:#:#: zeroing log - # of # blocks done >
On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > Remove this test, not sure why it was committed... > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > --- > tests/xfs/999 | 66 ----------------------------------------------------- > tests/xfs/999.out | 15 ------------ > 2 files changed, 81 deletions(-) > delete mode 100755 tests/xfs/999 > delete mode 100644 tests/xfs/999.out Thanks for spotting it. I'm quite sure this was a result of my initial attempts of using b4 to retrieve the xfsprogs patch from the list, and it ended up retrieving the whole thread which included xfstests patches. Won't happen again, thanks for the heads up. Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
On Tue, Jul 11, 2023 at 03:24:54PM +0200, Carlos Maiolino wrote: > On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <djwong@kernel.org> > > > > Remove this test, not sure why it was committed... > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > --- > > tests/xfs/999 | 66 ----------------------------------------------------- > > tests/xfs/999.out | 15 ------------ > > 2 files changed, 81 deletions(-) > > delete mode 100755 tests/xfs/999 > > delete mode 100644 tests/xfs/999.out > > Thanks for spotting it. I'm quite sure this was a result of my initial attempts > of using b4 to retrieve the xfsprogs patch from the list, and it ended up > retrieving the whole thread which included xfstests patches. > > Won't happen again, thanks for the heads up. Well I'm glad that /one/ of us now actually knows how to use b4, because I certainly don't. Maybe that's why Konstantin or whoever was talking about how every patch should include a link to a gitbranch or whatever. --D > > Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com> > > > -- > Carlos > > > > > diff --git a/tests/xfs/999 b/tests/xfs/999 > > deleted file mode 100755 > > index 9e799f66e72..00000000000 > > --- a/tests/xfs/999 > > +++ /dev/null > > @@ -1,66 +0,0 @@ > > -#! /bin/bash > > -# SPDX-License-Identifier: GPL-2.0 > > -# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. > > -# > > -# FS QA Test 521 > > -# > > -# Test xfs_repair's progress reporting > > -# > > -. ./common/preamble > > -_begin_fstest auto repair > > - > > -# Override the default cleanup function. > > -_cleanup() > > -{ > > - cd / > > - rm -f $tmp.* > > - _cleanup_delay > /dev/null 2>&1 > > -} > > - > > -# Import common functions. > > -. ./common/filter > > -. ./common/dmdelay > > -. ./common/populate > > - > > -# real QA test starts here > > - > > -# Modify as appropriate. > > -_supported_fs xfs > > -_require_scratch > > -_require_dm_target delay > > - > > -# Filter output specific to the formatters in xfs_repair/progress.c > > -# Ideally we'd like to see hits on anything that matches > > -# awk '/{FMT/' xfsprogs-dev/repair/progress.c > > -filter_repair() > > -{ > > - sed -nre ' > > - s/[0-9]+/#/g; > > - s/^\s+/ /g; > > - s/(# (week|day|hour|minute|second)s?(, )?)+/{progres}/g; > > - /#:#:#:/p > > - ' > > -} > > - > > -echo "Format and populate" > > -_scratch_populate_cached nofill > $seqres.full 2>&1 > > - > > -echo "Introduce a dmdelay" > > -_init_delay > > -DELAY_MS=38 > > - > > -# Introduce a read I/O delay > > -# The default in common/dmdelay is a bit too agressive > > -BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` > > -DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 $DELAY_MS" > > -_load_delay_table $DELAY_READ > > - > > -echo "Run repair" > > -SCRATCH_DEV=$DELAY_DEV _scratch_xfs_repair -o ag_stride=4 -t 1 2>&1 | > > - tee -a $seqres.full > $tmp.repair > > - > > -cat $tmp.repair | filter_repair | sort -u > > - > > -# success, all done > > -status=0 > > -exit > > diff --git a/tests/xfs/999.out b/tests/xfs/999.out > > deleted file mode 100644 > > index e27534d8de6..00000000000 > > --- a/tests/xfs/999.out > > +++ /dev/null > > @@ -1,15 +0,0 @@ > > -QA output created by 999 > > -Format and populate > > -Introduce a dmdelay > > -Run repair > > - - #:#:#: Phase #: #% done - estimated remaining time {progres} > > - - #:#:#: Phase #: elapsed time {progres} - processed # inodes per minute > > - - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done > > - - #:#:#: process known inodes and inode discovery - # of # inodes done > > - - #:#:#: process newly discovered inodes - # of # allocation groups done > > - - #:#:#: rebuild AG headers and trees - # of # allocation groups done > > - - #:#:#: scanning agi unlinked lists - # of # allocation groups done > > - - #:#:#: scanning filesystem freespace - # of # allocation groups done > > - - #:#:#: setting up duplicate extent list - # of # allocation groups done > > - - #:#:#: verify and correct link counts - # of # allocation groups done > > - - #:#:#: zeroing log - # of # blocks done
On Tue, Jul 11, 2023 at 07:54:41AM -0700, Darrick J. Wong wrote: > On Tue, Jul 11, 2023 at 03:24:54PM +0200, Carlos Maiolino wrote: > > On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > Remove this test, not sure why it was committed... > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > --- > > > tests/xfs/999 | 66 ----------------------------------------------------- > > > tests/xfs/999.out | 15 ------------ > > > 2 files changed, 81 deletions(-) > > > delete mode 100755 tests/xfs/999 > > > delete mode 100644 tests/xfs/999.out > > > > Thanks for spotting it. I'm quite sure this was a result of my initial attempts > > of using b4 to retrieve the xfsprogs patch from the list, and it ended up > > retrieving the whole thread which included xfstests patches. > > > > Won't happen again, thanks for the heads up. > > Well I'm glad that /one/ of us now actually knows how to use b4, because > I certainly don't. Maybe that's why Konstantin or whoever was talking > about how every patch should include a link to a gitbranch or whatever. If all you want to do is pull stuff from the mailing list, then all you need to know is this command: 'b4 am -o - <msgid> | git am -s' This pull the entire series from the thread associated with that msgid into the current branch with all the rvb/sob tags updated. I -think- this has all been rolled up into the newfangled 'b4 shazam' command, but I much prefer to use the original, simple, obvious put-the-pieces-together-yourself approach. -Dave.
On Wed, Jul 12, 2023 at 09:55:33AM +1000, Dave Chinner wrote: > On Tue, Jul 11, 2023 at 07:54:41AM -0700, Darrick J. Wong wrote: > > On Tue, Jul 11, 2023 at 03:24:54PM +0200, Carlos Maiolino wrote: > > > On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > > > Remove this test, not sure why it was committed... > > > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > > --- > > > > tests/xfs/999 | 66 ----------------------------------------------------- > > > > tests/xfs/999.out | 15 ------------ > > > > 2 files changed, 81 deletions(-) > > > > delete mode 100755 tests/xfs/999 > > > > delete mode 100644 tests/xfs/999.out > > > > > > Thanks for spotting it. I'm quite sure this was a result of my initial attempts > > > of using b4 to retrieve the xfsprogs patch from the list, and it ended up > > > retrieving the whole thread which included xfstests patches. > > > > > > Won't happen again, thanks for the heads up. > > > > Well I'm glad that /one/ of us now actually knows how to use b4, because > > I certainly don't. Maybe that's why Konstantin or whoever was talking > > about how every patch should include a link to a gitbranch or whatever. > > If all you want to do is pull stuff from the mailing list, then all > you need to know is this command: > > 'b4 am -o - <msgid> | git am -s' > > This pull the entire series from the thread associated with that > msgid into the current branch with all the rvb/sob tags updated. I > -think- this has all been rolled up into the newfangled 'b4 shazam' > command, but I much prefer to use the original, simple, obvious > put-the-pieces-together-yourself approach. This was exactly the case, the problem is, both xfstests patch and its xfsprogs counterpart were sent under the same thread, which caused b4 to pull both of them. What I noticed (and haven't until I looked a bit deeper during my PTO) is that b4 has an option to pull the patches into quilt format, so, that will make things way easier. Eitherway, I spoke with Darrick past night, and I'll rebase for-next to get rid of that patch, there is no point in pushing it to a new xfsprogs release.
On Wed, Jul 12, 2023 at 09:19:21AM +0200, Carlos Maiolino wrote: > On Wed, Jul 12, 2023 at 09:55:33AM +1000, Dave Chinner wrote: > > On Tue, Jul 11, 2023 at 07:54:41AM -0700, Darrick J. Wong wrote: > > > On Tue, Jul 11, 2023 at 03:24:54PM +0200, Carlos Maiolino wrote: > > > > On Sun, Jul 09, 2023 at 03:37:50PM -0700, Darrick J. Wong wrote: > > > > > From: Darrick J. Wong <djwong@kernel.org> > > > > > > > > > > Remove this test, not sure why it was committed... > > > > > > > > > > Signed-off-by: Darrick J. Wong <djwong@kernel.org> > > > > > --- > > > > > tests/xfs/999 | 66 ----------------------------------------------------- > > > > > tests/xfs/999.out | 15 ------------ > > > > > 2 files changed, 81 deletions(-) > > > > > delete mode 100755 tests/xfs/999 > > > > > delete mode 100644 tests/xfs/999.out > > > > > > > > Thanks for spotting it. I'm quite sure this was a result of my initial attempts > > > > of using b4 to retrieve the xfsprogs patch from the list, and it ended up > > > > retrieving the whole thread which included xfstests patches. > > > > > > > > Won't happen again, thanks for the heads up. > > > > > > Well I'm glad that /one/ of us now actually knows how to use b4, because > > > I certainly don't. Maybe that's why Konstantin or whoever was talking > > > about how every patch should include a link to a gitbranch or whatever. > > > > If all you want to do is pull stuff from the mailing list, then all > > you need to know is this command: > > > > 'b4 am -o - <msgid> | git am -s' > > > > This pull the entire series from the thread associated with that > > msgid into the current branch with all the rvb/sob tags updated. I > > -think- this has all been rolled up into the newfangled 'b4 shazam' > > command, but I much prefer to use the original, simple, obvious > > put-the-pieces-together-yourself approach. > > This was exactly the case, the problem is, both xfstests patch and its xfsprogs > counterpart were sent under the same thread, which caused b4 to pull both of > them. > What I noticed (and haven't until I looked a bit deeper during my PTO) is that > b4 has an option to pull the patches into quilt format, so, that will make > things way easier. I don't use that - I prefer to work from commits than mange patches directly. What I do take the list of commits that it creates, then run 'guilt import-commit <id range>' to pull the commits made from the patches into a guilt maintained patch series in the git repository. That generally requires checking that all the commits that were pulled in were the ones that were wanted, but then I can manage the branch as a "patch series in git commits" as needed. That's far easier than managing patches by hand to build a series to apply to the git tree.... Cheers, Dave.
diff --git a/tests/xfs/999 b/tests/xfs/999 deleted file mode 100755 index 9e799f66e72..00000000000 --- a/tests/xfs/999 +++ /dev/null @@ -1,66 +0,0 @@ -#! /bin/bash -# SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2020 Red Hat, Inc. All Rights Reserved. -# -# FS QA Test 521 -# -# Test xfs_repair's progress reporting -# -. ./common/preamble -_begin_fstest auto repair - -# Override the default cleanup function. -_cleanup() -{ - cd / - rm -f $tmp.* - _cleanup_delay > /dev/null 2>&1 -} - -# Import common functions. -. ./common/filter -. ./common/dmdelay -. ./common/populate - -# real QA test starts here - -# Modify as appropriate. -_supported_fs xfs -_require_scratch -_require_dm_target delay - -# Filter output specific to the formatters in xfs_repair/progress.c -# Ideally we'd like to see hits on anything that matches -# awk '/{FMT/' xfsprogs-dev/repair/progress.c -filter_repair() -{ - sed -nre ' - s/[0-9]+/#/g; - s/^\s+/ /g; - s/(# (week|day|hour|minute|second)s?(, )?)+/{progres}/g; - /#:#:#:/p - ' -} - -echo "Format and populate" -_scratch_populate_cached nofill > $seqres.full 2>&1 - -echo "Introduce a dmdelay" -_init_delay -DELAY_MS=38 - -# Introduce a read I/O delay -# The default in common/dmdelay is a bit too agressive -BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV` -DELAY_TABLE_RDELAY="0 $BLK_DEV_SIZE delay $SCRATCH_DEV 0 $DELAY_MS" -_load_delay_table $DELAY_READ - -echo "Run repair" -SCRATCH_DEV=$DELAY_DEV _scratch_xfs_repair -o ag_stride=4 -t 1 2>&1 | - tee -a $seqres.full > $tmp.repair - -cat $tmp.repair | filter_repair | sort -u - -# success, all done -status=0 -exit diff --git a/tests/xfs/999.out b/tests/xfs/999.out deleted file mode 100644 index e27534d8de6..00000000000 --- a/tests/xfs/999.out +++ /dev/null @@ -1,15 +0,0 @@ -QA output created by 999 -Format and populate -Introduce a dmdelay -Run repair - - #:#:#: Phase #: #% done - estimated remaining time {progres} - - #:#:#: Phase #: elapsed time {progres} - processed # inodes per minute - - #:#:#: check for inodes claiming duplicate blocks - # of # inodes done - - #:#:#: process known inodes and inode discovery - # of # inodes done - - #:#:#: process newly discovered inodes - # of # allocation groups done - - #:#:#: rebuild AG headers and trees - # of # allocation groups done - - #:#:#: scanning agi unlinked lists - # of # allocation groups done - - #:#:#: scanning filesystem freespace - # of # allocation groups done - - #:#:#: setting up duplicate extent list - # of # allocation groups done - - #:#:#: verify and correct link counts - # of # allocation groups done - - #:#:#: zeroing log - # of # blocks done