xfs: filter stripe width details from repair

Several golden outputs have:

> Note - stripe unit (0) and width (0) fields have been reset.

but it's entirely possible for this to be non-zero,
which then fails to match and fails the test.

Filter this repair output and fix the golden files.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eric Sandeen
2016-05-19 16:19:51 -05:00
committed by Eryu Guan
parent a6f6e594f7
commit dddc12bc76
4 changed files with 8 additions and 6 deletions
+2
View File
@@ -89,6 +89,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/;
# And make them generic so we dont depend on geometry
s/(stripe unit) \(.*\) (and width) \(.*\)/\1 (SU) \2 (SW)/;
# corrupt sb messages
s/(superblock) (\d+)/\1 AGNO/;
s/(AG \#)(\d+)/\1AGNO/;
+2 -2
View File
@@ -39,7 +39,7 @@ Phase 6 - check inode connectivity...
- traversal finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
Corrupting agf 0 - setting bits to 0
@@ -156,7 +156,7 @@ Phase 6 - check inode connectivity...
- traversal finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
Corrupting agf 0 - setting bits to -1
+2 -2
View File
@@ -43,7 +43,7 @@ Phase 6 - check inode connectivity...
- traversals finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
Corrupting agf 0 - setting bits to 0
@@ -186,7 +186,7 @@ Phase 6 - check inode connectivity...
- traversals finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
Corrupting agf 0 - setting bits to -1
+2 -2
View File
@@ -37,7 +37,7 @@ Phase 6 - check inode connectivity...
- traversal finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
repair passed
@@ -73,7 +73,7 @@ Phase 6 - check inode connectivity...
- traversal finished ...
- moving disconnected inodes to lost+found ...
Phase 7 - verify and correct link counts...
Note - stripe unit (0) and width (0) fields have been reset.
Note - stripe unit (SU) and width (SW) fields have been reset.
Please set with mount -o sunit=<value>,swidth=<value>
done
repair passed