Skip to contentSkip to conversation

xfs/096: strip log stripe warnings from mkfs.xfs

PATCH Superseded Dave Chinner 1 participant 2 messages Nov 20, 2014

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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

---
 tests/xfs/096          | 1 +
 tests/xfs/096.external | 2 --
 tests/xfs/096.internal | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)
tests/xfs/096 +1 -0
index b2719bc..0179e77 100755
@@ -88,6 +88,7 @@ _mkfs_filter()
 	-e '/.*crc=/d' \
 	-e 's/ *$//' \
 	-e 's/ ftype=[01]//' \
+	-e '/^log stripe unit/d' \
    | grep -v parent
 }
 
tests/xfs/096.external +0 -2
index 9175904..95833c8 100644
@@ -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
index cf75037..7bf848c 100644
@@ -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
#1 lore raw
Quoted 8 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.

Ugh, ignore this patch - it's an old version. Updated patch to follow shortly.

-Dave

Signature · 2 lines
Dave Chinner
[email protected]