[7/9] xfs/030: hide the btree levels check errors

Commit Message

Darrick J. Wong Oct. 27, 2020, 7:02 p.m. UTC

From: Darrick J. Wong <[e-mail]>

Newer versions of xfsprogs now complain if the rmap and refcount btree
levels are insane, so hide that error from the golden output.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 common/repair |    1 +
 tests/xfs/030 |    1 +
 2 files changed, 2 insertions(+)

Comments

Christoph Hellwig Oct. 28, 2020, 7:43 a.m. UTC | #1

On Tue, Oct 27, 2020 at 12:02:15PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <[e-mail]>
> 
> Newer versions of xfsprogs now complain if the rmap and refcount btree
> levels are insane, so hide that error from the golden output.
> 
> Signed-off-by: Darrick J. Wong <[e-mail]>

Looks good,

Reviewed-by: Christoph Hellwig <[e-mail]>

Patch

diff --git a/common/repair b/common/repair
index 6668dd51..0ae7464e 100644
--- a/common/repair
+++ b/common/repair
@@ -45,6 +45,7 @@  s/(bad length -{0,1}\d+ for ag. 0, should be) (\d+)/\1 LENGTH/;
 s/(bad length # -{0,1}\d+ for ag. 0, should be) (\d+)/\1 LENGTH/;
 s/(bad agbno) (\d+)/\1 AGBNO/g;
 s/(max =) (\d+)/\1 MAX/g;
+s/(bad levels) (\d+) (for [a-z]* root, agno) (\d+)/\1 LEVELS \3 AGNO/;
 # for root inos
 s/(on inode) (\d+)/\1 INO/g;
 s/(imap claims a free inode) (\d+)/\1 INO/;
diff --git a/tests/xfs/030 b/tests/xfs/030
index b6590913..04440f9c 100755
--- a/tests/xfs/030
+++ b/tests/xfs/030
@@ -45,6 +45,7 @@  _check_ag()
 			    -e '/^agf has bad CRC/d' \
 			    -e '/^agi has bad CRC/d' \
 			    -e '/^Missing reverse-mapping record.*/d' \
+			    -e '/^bad levels LEVELS for [a-z]* root.*/d' \
 			    -e '/^unknown block state, ag AGNO, block.*/d'
 	done
 }