xfs/096: strip log stripe warnings from mkfs.xfs
PATCH v2 1/1 xfs/096: strip log stripe warnings from mkfs.xfs
From: Dave Chinner <[email protected]>
The warnings have been removed when stripe unit/width are too big for the log stripe unit to be set. Hence add them to the mkfs.xfs filter and strip them from golden output file so the test succeeds on both new and old mfks binaries.
Signed-off-by Dave Chinner <[email protected]>
--- tests/xfs/096 | 4 +++- tests/xfs/096.external | 2 -- tests/xfs/096.internal | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-)
tests/xfs/096 +3 -1
@@ -88,6 +88,8 @@ _mkfs_filter() -e '/.*crc=/d' \ -e 's/ *$//' \ -e 's/ ftype=[01]//' \ + -e '/^log stripe unit.*too large/d' \ + -e '/^log stripe unit adjusted/d' \ | grep -v parent }
@@ -143,7 +145,7 @@ do fi echo "--- mkfs=$mkfs ---" export MKFS_OPTIONS="$mkfs" - _scratch_mkfs_xfs | _mkfs_filter + _scratch_mkfs_xfs 2>&1 | _mkfs_filter echo "" echo "" done
tests/xfs/096.external +0 -2
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1
tests/xfs/096.internal +0 -4
@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1
@@ -20,8 +18,6 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N # same test but get log stripe from data stripe --- mkfs=-l version=2 -d su=266240,sw=1 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=65 swidth=65 blks, unwritten=1
Signature · 1 line
2.0.0
ping?
Quoted 79 lines · Dave Chinner
From: Dave Chinner <[email protected]>
The warnings have been removed when stripe unit/width are too big for the log stripe unit to be set. Hence add them to the mkfs.xfs filter and strip them from golden output file so the test succeeds on both new and old mfks binaries.
Signed-off-by Dave Chinner <[email protected]>--- tests/xfs/096 | 4 +++- tests/xfs/096.external | 2 -- tests/xfs/096.internal | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-)tests/xfs/096 +3
-1@@ -88,6 +88,8 @@ _mkfs_filter() -e '/.*crc=/d' \ -e 's/ *$//' \ -e 's/ ftype=[01]//' \ + -e '/^log stripe unit.*too large/d' \ + -e '/^log stripe unit adjusted/d' \ | grep -v parent }@@ -143,7 +145,7 @@ do fi echo "--- mkfs=$mkfs ---" export MKFS_OPTIONS="$mkfs" - _scratch_mkfs_xfs | _mkfs_filter + _scratch_mkfs_xfs 2>&1 | _mkfs_filter echo "" echo "" donetests/xfs/096.external +0
-2@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1tests/xfs/096.internal +0
-4@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1@@ -20,8 +18,6 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N # same test but get log stripe from data stripe --- mkfs=-l version=2 -d su=266240,sw=1 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=65 swidth=65 blks, unwritten=1Signature · 6 lines
2.0.0 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 2 lines
Dave Chinner [email protected]
Quoted 9 lines · Dave Chinner
From: Dave Chinner <[email protected]>
The warnings have been removed when stripe unit/width are too big for the log stripe unit to be set. Hence add them to the mkfs.xfs filter and strip them from golden output file so the test succeeds on both new and old mfks binaries.
Signed-off-by Dave Chinner <[email protected]>---
Looks fine and makes xfs/096 pass again...
Reviewed-by Brian Foster <[email protected]>
Quoted 69 lines
tests/xfs/096 | 4 +++- tests/xfs/096.external | 2 -- tests/xfs/096.internal | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-)tests/xfs/096 +3
-1@@ -88,6 +88,8 @@ _mkfs_filter() -e '/.*crc=/d' \ -e 's/ *$//' \ -e 's/ ftype=[01]//' \ + -e '/^log stripe unit.*too large/d' \ + -e '/^log stripe unit adjusted/d' \ | grep -v parent }@@ -143,7 +145,7 @@ do fi echo "--- mkfs=$mkfs ---" export MKFS_OPTIONS="$mkfs" - _scratch_mkfs_xfs | _mkfs_filter + _scratch_mkfs_xfs 2>&1 | _mkfs_filter echo "" echo "" donetests/xfs/096.external +0
-2@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1tests/xfs/096.internal +0
-4@@ -7,8 +7,6 @@ log stripe unit (262656) must be a multiple of the block size (4096) # test log stripe greater than LR size --- mkfs=-l version=2,su=266240 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=0 swidth=0 blks, unwritten=1@@ -20,8 +18,6 @@ realtime =REALTIME extsz=N, blocks=N, rtextents=N # same test but get log stripe from data stripe --- mkfs=-l version=2 -d su=266240,sw=1 --- -log stripe unit (266240 bytes) is too large (maximum is 256KiB) -log stripe unit adjusted to 32KiB meta-data=DEV isize=256 agcount=N, agsize=N blks data = bsize=4096 blocks=N, imaxpct=N = sunit=65 swidth=65 blks, unwritten=1Signature · 6 lines
2.0.0 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html