[PATCH] filter stripe width details from repair

Eric Sandeen
2016-05-19T21:19:53Z

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>
---

diff --git a/common/repair b/common/repair
index 537d943..2b1583b 100644
--- a/common/repair
+++ b/common/repair
@@ -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/;
diff --git a/tests/xfs/030.out.linux b/tests/xfs/030.out.linux
index cf3259f..514ba30 100644
--- a/tests/xfs/030.out.linux
+++ b/tests/xfs/030.out.linux
@@ -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
diff --git a/tests/xfs/148.out b/tests/xfs/148.out
index 466a55d..c8fb551 100644
--- a/tests/xfs/148.out
+++ b/tests/xfs/148.out
@@ -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
diff --git a/tests/xfs/178.out b/tests/xfs/178.out
index 1709863..8e0fc8e 100644
--- a/tests/xfs/178.out
+++ b/tests/xfs/178.out
@@ -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