xfs/010,030: filter AG header CRC error warnings
diff mbox series

Message ID 20200713184930.GK7600@magnolia
State New
Headers show
Series
  • xfs/010,030: filter AG header CRC error warnings
Related show

Commit Message

Darrick J. Wong July 13, 2020, 6:49 p.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

Filter out the new AG header CRC verification warnings in xfs_repair
since these tests were built before that existed.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/xfs/010 |    6 +++++-
 tests/xfs/030 |    2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

Comments

Zorro Lang July 14, 2020, 7:13 a.m. UTC | #1
On Mon, Jul 13, 2020 at 11:49:30AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> Filter out the new AG header CRC verification warnings in xfs_repair
> since these tests were built before that existed.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/xfs/010 |    6 +++++-
>  tests/xfs/030 |    2 ++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/010 b/tests/xfs/010
> index c341795d..ec23507a 100755
> --- a/tests/xfs/010
> +++ b/tests/xfs/010
> @@ -113,7 +113,11 @@ _check_scratch_fs
>  # nuke the finobt root, repair will have to regenerate from the inobt
>  _corrupt_finobt_root $SCRATCH_DEV
>  
> -_scratch_xfs_repair 2>&1 | sed -e '/^bad finobt block/d' | _filter_repair_lostblocks

I think this patch is based on another patch which hasn't been merged, right?
Due to I can't find the *sed -e '/^bad finobt block/d'* on current xfstests-dev
master branch, which HEAD is:
  aae8fbec  generic/270: wait for fsstress processes to be killed

Thanks,
Zorro

> +filter_finobt_repair() {
> +	sed -e '/^agi has bad CRC/d' -e '/^bad finobt block/d' | _filter_repair_lostblocks
> +}
> +
> +_scratch_xfs_repair 2>&1 | filter_finobt_repair
>  
>  status=0
>  exit
> diff --git a/tests/xfs/030 b/tests/xfs/030
> index 8f95331a..a270e36c 100755
> --- a/tests/xfs/030
> +++ b/tests/xfs/030
> @@ -43,6 +43,8 @@ _check_ag()
>  			    -e '/^bad agbno AGBNO for rmapbt/d' \
>  			    -e '/^bad agbno AGBNO for refcntbt/d' \
>  			    -e '/^bad inobt block count/d' \
> +			    -e '/^agf has bad CRC/d' \
> +			    -e '/^agi has bad CRC/d' \
>  			    -e '/^bad finobt block count/d' \
>  			    -e '/^Missing reverse-mapping record.*/d' \
>  			    -e '/^unknown block state, ag AGNO, block.*/d'
>
Darrick J. Wong July 15, 2020, 4:57 p.m. UTC | #2
On Tue, Jul 14, 2020 at 03:13:46PM +0800, Zorro Lang wrote:
> On Mon, Jul 13, 2020 at 11:49:30AM -0700, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@oracle.com>
> > 
> > Filter out the new AG header CRC verification warnings in xfs_repair
> > since these tests were built before that existed.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/xfs/010 |    6 +++++-
> >  tests/xfs/030 |    2 ++
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/tests/xfs/010 b/tests/xfs/010
> > index c341795d..ec23507a 100755
> > --- a/tests/xfs/010
> > +++ b/tests/xfs/010
> > @@ -113,7 +113,11 @@ _check_scratch_fs
> >  # nuke the finobt root, repair will have to regenerate from the inobt
> >  _corrupt_finobt_root $SCRATCH_DEV
> >  
> > -_scratch_xfs_repair 2>&1 | sed -e '/^bad finobt block/d' | _filter_repair_lostblocks
> 
> I think this patch is based on another patch which hasn't been merged, right?
> Due to I can't find the *sed -e '/^bad finobt block/d'* on current xfstests-dev
> master branch, which HEAD is:
>   aae8fbec  generic/270: wait for fsstress processes to be killed

Oops, yeah, I forgot that my development branch has multiple patches to
those tests.  Now that xfsprogs for-next has updated I guess I should
clean all those up and send them for real.

--D

> Thanks,
> Zorro
> 
> > +filter_finobt_repair() {
> > +	sed -e '/^agi has bad CRC/d' -e '/^bad finobt block/d' | _filter_repair_lostblocks
> > +}
> > +
> > +_scratch_xfs_repair 2>&1 | filter_finobt_repair
> >  
> >  status=0
> >  exit
> > diff --git a/tests/xfs/030 b/tests/xfs/030
> > index 8f95331a..a270e36c 100755
> > --- a/tests/xfs/030
> > +++ b/tests/xfs/030
> > @@ -43,6 +43,8 @@ _check_ag()
> >  			    -e '/^bad agbno AGBNO for rmapbt/d' \
> >  			    -e '/^bad agbno AGBNO for refcntbt/d' \
> >  			    -e '/^bad inobt block count/d' \
> > +			    -e '/^agf has bad CRC/d' \
> > +			    -e '/^agi has bad CRC/d' \
> >  			    -e '/^bad finobt block count/d' \
> >  			    -e '/^Missing reverse-mapping record.*/d' \
> >  			    -e '/^unknown block state, ag AGNO, block.*/d'
> > 
>

Patch
diff mbox series

diff --git a/tests/xfs/010 b/tests/xfs/010
index c341795d..ec23507a 100755
--- a/tests/xfs/010
+++ b/tests/xfs/010
@@ -113,7 +113,11 @@  _check_scratch_fs
 # nuke the finobt root, repair will have to regenerate from the inobt
 _corrupt_finobt_root $SCRATCH_DEV
 
-_scratch_xfs_repair 2>&1 | sed -e '/^bad finobt block/d' | _filter_repair_lostblocks
+filter_finobt_repair() {
+	sed -e '/^agi has bad CRC/d' -e '/^bad finobt block/d' | _filter_repair_lostblocks
+}
+
+_scratch_xfs_repair 2>&1 | filter_finobt_repair
 
 status=0
 exit
diff --git a/tests/xfs/030 b/tests/xfs/030
index 8f95331a..a270e36c 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -43,6 +43,8 @@  _check_ag()
 			    -e '/^bad agbno AGBNO for rmapbt/d' \
 			    -e '/^bad agbno AGBNO for refcntbt/d' \
 			    -e '/^bad inobt block count/d' \
+			    -e '/^agf has bad CRC/d' \
+			    -e '/^agi has bad CRC/d' \
 			    -e '/^bad finobt block count/d' \
 			    -e '/^Missing reverse-mapping record.*/d' \
 			    -e '/^unknown block state, ag AGNO, block.*/d'