apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fstests: fix up filters & expected output for latest xfs_repair

Browse Source 
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.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by Zorro Lang <zlang@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Eric Sandeen
2020-02-27 20:50:49 -08:00
committed by Eryu Guan
parent 6a5e629bfb
commit 48045df9a8
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repair
+9 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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...