fstests: fix up filters & expected output for latest xfs_repair
PATCH 1/1 fstests: fix up filters & expected output for latest xfs_repair
A handful of minor changes went into xfs_repair output in the last push, so add a few more filters and change the resulting expected output.
---
I confirmed that xfs/030, xfs/033, and xfs/178 pass on both current for-next, as well as v5.4.0
common/repair +9 -1
@@ -29,7 +29,13 @@ _filter_repair() # for sb /- agno = / && next; # remove each AG line (variable number) s/(pointer to) (\d+)/\1 INO/; -s/(sb root inode value) (\d+)( \(NULLFSINO\))?/\1 INO/; +# Changed inode output in 5.5.0 +s/sb root inode value /sb root inode /; +s/realtime bitmap inode value /realtime bitmap inode /; +s/realtime summary inode value /realtime summary inode /; +s/ino pointer to /inode pointer to /; +# +s/(sb root inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime bitmap inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime summary inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(inconsistent with calculated value) (\d+)/\1 INO/;
@@ -74,6 +80,8 @@ s/(inode chunk) (\d+)\/(\d+)/AGNO\/INO/; # sunit/swidth reset messages s/^(Note - .*) were copied.*/\1 fields have been reset./; s/^(Please) reset (with .*) if necessary/\1 set \2/; +# remove new unlinked inode test +/^bad next_unlinked/ && next; # And make them generic so we dont depend on geometry s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/; # corrupt sb messages
tests/xfs/030.out +6 -6
@@ -14,12 +14,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...
@@ -131,12 +131,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...
tests/xfs/178.out +6 -6
@@ -12,12 +12,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...
@@ -48,12 +48,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...
Quoted 6 lines · Eric Sandeen
A handful of minor changes went into
xfs_repairoutput in the last push, so add a few more filters and change the resulting expected output.Signed-off-by Eric Sandeen <[email protected]>---
This change makes sense, and I've tested it on rhel7, rhel8 and latest upstream kernel with xfsprogs(for-next), this patch doesn't brings more failures. So it looks good to me.
Reviewed-by Zorro Lang <[email protected]>
Quoted 105 lines
I confirmed that xfs/030, xfs/033, and xfs/178 pass on both current for-next, as well as v5.4.0
common/repair +9
-1@@ -29,7 +29,13 @@ _filter_repair() # for sb /- agno = / && next; # remove each AG line (variable number) s/(pointer to) (\d+)/\1 INO/; -s/(sb root inode value) (\d+)( \(NULLFSINO\))?/\1 INO/; +# Changed inode output in 5.5.0 +s/sb root inode value /sb root inode /; +s/realtime bitmap inode value /realtime bitmap inode /; +s/realtime summary inode value /realtime summary inode /; +s/ino pointer to /inode pointer to /; +# +s/(sb root inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime bitmap inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime summary inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(inconsistent with calculated value) (\d+)/\1 INO/;@@ -74,6 +80,8 @@ s/(inode chunk) (\d+)\/(\d+)/AGNO\/INO/; # sunit/swidth reset messages s/^(Note - .*) were copied.*/\1 fields have been reset./; s/^(Please) reset (with .*) if necessary/\1 set \2/; +# remove new unlinked inode test +/^bad next_unlinked/ && next; # And make them generic so we dont depend on geometry s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/; # corrupt sb messagestests/xfs/030.out +6
-6@@ -14,12 +14,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...@@ -131,12 +131,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...tests/xfs/178.out +6
-6@@ -12,12 +12,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...@@ -48,12 +48,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...
Quoted 5 lines · Eric Sandeen
A handful of minor changes went into
xfs_repairoutput in the last push, so add a few more filters and change the resulting expected output.Signed-off-by Eric Sandeen <[email protected]>
Rrrgh, guess who also had this patch lurking in his xfstests tree for so long that he forgot it was there...
--D
Quoted 106 lines
---
I confirmed that xfs/030, xfs/033, and xfs/178 pass on both current for-next, as well as v5.4.0
common/repair +9
-1@@ -29,7 +29,13 @@ _filter_repair() # for sb /- agno = / && next; # remove each AG line (variable number) s/(pointer to) (\d+)/\1 INO/; -s/(sb root inode value) (\d+)( \(NULLFSINO\))?/\1 INO/; +# Changed inode output in 5.5.0 +s/sb root inode value /sb root inode /; +s/realtime bitmap inode value /realtime bitmap inode /; +s/realtime summary inode value /realtime summary inode /; +s/ino pointer to /inode pointer to /; +# +s/(sb root inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime bitmap inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(realtime summary inode) (\d+)( \(NULLFSINO\))?/\1 INO/; s/(inconsistent with calculated value) (\d+)/\1 INO/;@@ -74,6 +80,8 @@ s/(inode chunk) (\d+)\/(\d+)/AGNO\/INO/; # sunit/swidth reset messages s/^(Note - .*) were copied.*/\1 fields have been reset./; s/^(Please) reset (with .*) if necessary/\1 set \2/; +# remove new unlinked inode test +/^bad next_unlinked/ && next; # And make them generic so we dont depend on geometry s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/; # corrupt sb messagestests/xfs/030.out +6
-6@@ -14,12 +14,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...@@ -131,12 +131,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...tests/xfs/178.out +6
-6@@ -12,12 +12,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...@@ -48,12 +48,12 @@ attempting to find secondary superblock... found candidate secondary superblock... verified secondary superblock... writing modified primary superblock -sb root inode value INO inconsistent with calculated value INO +sb root inode INO inconsistent with calculated value INO resetting superblock root inode pointer to INO sb realtime bitmap inode INO inconsistent with calculated value INO -resetting superblock realtime bitmap ino pointer to INO +resetting superblock realtime bitmap inode pointer to INO sb realtime summary inode INO inconsistent with calculated value INO -resetting superblock realtime summary ino pointer to INO +resetting superblock realtime summary inode pointer to INO Phase 2 - using <TYPEOF> log - zero log... - scan filesystem freespace and inode maps...