Skip to contentSkip to conversation

common/repair: filter unknown block state properly

PATCH In review Zorro Lang 2 participants 2 messages Oct 27, 2020

lore
Share & tools
lore

Zorro Lang

author
#0 lore raw

PATCH 1/1 common/repair: filter unknown block state properly

xfsprogs 32e11be9 ("xfs_repair: complain about extents in unknown state") changed the xfs_repair output format as below:

- _("unknown block state, ag %d, block %d\n"),
- i, j);
+ _("unknown block state, ag %d, blocks %u-%u\n"),
+ i, j, j + blen - 1);

It replaces "block" with "blocks". That cause xfs/030 fails. So use proper regex to filter the 'old' and 'new' output format both.

---
 common/repair | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/repair +2 -2
index 6668dd51..c8d16314 100644
@@ -88,7 +88,7 @@ s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/;
 s/(superblock) (\d+)/\1 AGNO/;
 s/(AG \#)(\d+)/\1AGNO/;
 s/(reset bad sb for ag) (\d+)/\1 AGNO/;
-s/(unknown block state, ag )(\d+)(, block )(\d+)/\1AGNO\3AGBNO/;
+s/(unknown block state, ag )(\d+)(, blocks? )(\d+)/\1AGNO\3AGBNO/;
 /^Note - quota info will be regenerated on next quota mount.$/ && next;
 	print;'
 }
@@ -98,7 +98,7 @@ s/(unknown block state, ag )(\d+)(, block )(\d+)/\1AGNO\3AGBNO/;
 # tree and fails to reconcile the metadata reverse mappings against the
 # metadata).
 _filter_repair_lostblocks() {
-	_filter_repair | sed -e '/unknown block state, ag AGNO, block AGBNO/d'
+	_filter_repair | sed -e '/unknown block state, ag AGNO, blocks* AGBNO/d'
 }
 
 _filter_dd()
Signature · 1 line
2.25.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Zorro Lang

xfsprogs 32e11be9 ("xfs_repair: complain about extents in unknown state") changed the xfs_repair output format as below:

- _("unknown block state, ag %d, block %d\n"),
- i, j);
+ _("unknown block state, ag %d, blocks %u-%u\n"),
+ i, j, j + blen - 1);

Quoted 4 lines

It replaces "block" with "blocks". That cause xfs/030 fails. So use proper regex to filter the 'old' and 'new' output format both.

Aha, I had a patch to do exactly this sitting in my xfstests tree that I never sent out.

Egad, I haven't sent much of anything since 5.6. I better get on that.

In the meantime,

--D

Quoted 29 lines
---
 common/repair | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/repair +2 -2
index 6668dd51..c8d16314 100644
@@ -88,7 +88,7 @@ s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/;
 s/(superblock) (\d+)/\1 AGNO/;
 s/(AG \#)(\d+)/\1AGNO/;
 s/(reset bad sb for ag) (\d+)/\1 AGNO/;
-s/(unknown block state, ag )(\d+)(, block )(\d+)/\1AGNO\3AGBNO/;
+s/(unknown block state, ag )(\d+)(, blocks? )(\d+)/\1AGNO\3AGBNO/;
 /^Note - quota info will be regenerated on next quota mount.$/ && next;
 	print;'
 }
@@ -98,7 +98,7 @@ s/(unknown block state, ag )(\d+)(, block )(\d+)/\1AGNO\3AGBNO/;
 # tree and fails to reconcile the metadata reverse mappings against the
 # metadata).
 _filter_repair_lostblocks() {
-	_filter_repair | sed -e '/unknown block state, ag AGNO, block AGBNO/d'
+	_filter_repair | sed -e '/unknown block state, ag AGNO, blocks* AGBNO/d'
 }
 
 _filter_dd()
Signature · 1 line
2.25.4