update to handle striped v2 logs

diff --git a/018 b/018
index d0a7849ac4b89359245c592f01fa94dd044b85b8..dd3a71babd0aecaa5a39a64479fab52361a9dea5 100755 (executable)
--- a/018
+++ b/018
@@ -171,6 +171,7 @@ _filter_logprint()
         s/^uuid: *[0-9a-f-][0-9a-f-]* *format: *.*$/uuid: <UUID> format: <FORMAT>/;
         /flushiter:/d;
        /version:/,/h_size:/d;
+       /override tail/s/[0-9][0-9]*/<TAIL_BLK>/;
        /^---*/d;
        /^===*/d;
        /^~~~*/d;
@@ -212,11 +213,12 @@ _print_operation()
 
 _print_transaction_inode()
 {
+    _start=$1
     raw=$seq.trans_inode.mnt$mnt.mkfs$mkfs.raw
     filtered=$seq.trans_inode.mnt$mnt.mkfs$mkfs.filtered
 
-    echo "### xfs_logprint -t -i -s 2 output ###" | tee $raw >$filtered
-    _scratch_xfs_logprint -t -i -s 2 2>&1 \
+    echo "### xfs_logprint -t -i -s START output ###" | tee $raw >$filtered
+    _scratch_xfs_logprint -t -i -s $_start 2>&1 \
     | tee -a $raw      \
     | _filter_logprint \
     >>$filtered
@@ -224,11 +226,12 @@ _print_transaction_inode()
 
 _print_transaction_buf()
 {
+    _start=$1
     raw=$seq.trans_buf.mnt$mnt.mkfs$mkfs.raw
     filtered=$seq.trans_buf.mnt$mnt.mkfs$mkfs.filtered
 
-    echo "### xfs_logprint -t -b -s 2 output ###" | tee $raw >$filtered
-    _scratch_xfs_logprint -t -b -s 2 2>&1 \
+    echo "### xfs_logprint -t -b -s START output ###" | tee $raw >$filtered
+    _scratch_xfs_logprint -t -b -s $_start 2>&1 \
     | tee -a $raw      \
     | _filter_logprint \
     >>$filtered
@@ -392,24 +395,24 @@ echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1
 
 cat >$tmp.seq.params <<EOF
-# mkfs-opt        mount-opt
-  -lversion=1     -ologbsize=32k
-  -lversion=2     -ologbsize=32k
-  -lversion=2     -ologbsize=64k
-  -lversion=2     -ologbsize=128k
-  -lversion=2     -ologbsize=256k
+# mkfs-opt        mount-opt            start-blk
+  -lversion=1     -ologbsize=32k       2
+  -lversion=2     -ologbsize=32k       2
+  -lversion=2     -ologbsize=64k       2
+  -lversion=2     -ologbsize=128k      2
+  -lversion=2     -ologbsize=256k      2
 # NB: Stripe only affects LRs which weren't full when written out
 #     So if we wrote out 32K LR then the stripe has no effect
 #     In our case, it is likely that the LRs will be full but
 #     it may no be the case in all QA environments where the LR
 #     may be forced out early.
-#  -lversion=2,su=4096 -ologbsize=32k
+  -lversion=2,su=4096 -ologbsize=32k   8
 EOF
 
 # do the work for various log params which
 # should not effect the data content of the log
 cat $tmp.seq.params \
-| while read mkfs mnt
+| while read mkfs mnt start
 do
     if [ "$mkfs" != "#" ]; then 
        _mkfs_create_log $mkfs $mnt
@@ -418,10 +421,10 @@ do
        _print_operation
        _cmp_op_output $seq.noquota.op $filtered
 
-       _print_transaction_inode
+       _print_transaction_inode $start
        _cmp_output $seq.noquota.trans_inode $filtered
 
-       _print_transaction_buf
+       _print_transaction_buf $start
        _cmp_output $seq.noquota.trans_buf $filtered
     fi
 done
@@ -431,7 +434,7 @@ mkfs="-lversion=1"
 mnt="-ousrquota,grpquota"
 _mkfs_create_log $mkfs $mnt
 _check_log
-_print_transaction_inode
+_print_transaction_inode 2
 _cmp_output $seq.ugquota.trans_inode $filtered
 
 # got thru it all so we may have success

diff --git a/018.noquota.trans_buf b/018.noquota.trans_buf
index 80802c491b8cb560622128a36cbc1cbf3e65d08a..9f702030dd585ff01265260d9edafe069e840df2 100644 (file)
--- a/018.noquota.trans_buf
+++ b/018.noquota.trans_buf
@@ -1,9 +1,9 @@
-### xfs_logprint -t -b -s 2 output ###
+### xfs_logprint -t -b -s START output ###
 xfs_logprint:
  data device: <DEVICE>
  log device: <DEVICE> daddr: <DADDR> length: <LENGTH>
  log tail: <COUNT> head: <COUNT> state: <CLEAN>
- override tail: 2
+ override tail: <TAIL_BLK>
 TRANS: tid:<TID> type:CREATE #items:5 trans:0x0 q:<Q>
 BUF: cnt:2 total:2 a:<A> len:<LEN> a:<A> len:<LEN>
        BUF: #regs:2 start blkno:<BLKNO> len:<LEN> bmap size:1

diff --git a/018.noquota.trans_inode b/018.noquota.trans_inode
index 8d9ab58a54549b4b206b120588c8e134c1684af4..0064e5caae11e10d5f9b5d0d27e867719973f92e 100644 (file)
--- a/018.noquota.trans_inode
+++ b/018.noquota.trans_inode
@@ -1,9 +1,9 @@
-### xfs_logprint -t -i -s 2 output ###
+### xfs_logprint -t -i -s START output ###
 xfs_logprint:
  data device: <DEVICE>
  log device: <DEVICE> daddr: <DADDR> length: <LENGTH>
  log tail: <COUNT> head: <COUNT> state: <CLEAN>
- override tail: 2
+ override tail: <TAIL_BLK>
 TRANS: tid:<TID> type:CREATE #items:5 trans:0x0 q:<Q>
 BUF: cnt:2 total:2 a:<A> len:<LEN> a:<A> len:<LEN>
        BUF: #regs:2 start blkno:<BLKNO> len:<LEN> bmap size:1

diff --git a/018.out b/018.out
index 9250c87bc79d0cbb4dfa794aeb96a8ce9f8d33d2..b18ce4fe3289fa6cefa828dd1db1e03adf9a6a0e 100644 (file)
--- a/018.out
+++ b/018.out
@@ -51,5 +51,14 @@ data     = bsize=XXX blocks=XXX, imaxpct=PCT
 naming   =VERN bsize=XXX
 log      =LDEV bsize=XXX blocks=XXX
 realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
+*** compare logprint: 018.noquota.op with 018.op.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.filtered
+*** compare logprint: 018.noquota.trans_inode with 018.trans_inode.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.filtered
+*** compare logprint: 018.noquota.trans_buf with 018.trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.filtered
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 *** compare logprint: 018.ugquota.trans_inode with 018.trans_inode.mnt-ousrquota,grpquota.mkfs-lversion=1.filtered
 *** unmount

diff --git a/018.ugquota.trans_inode b/018.ugquota.trans_inode
index 5160b7cc8e63e32120aef166d765a2682cd6fca1..7229384b2f7dc7b3e4d21c9f232770825c125edd 100644 (file)
--- a/018.ugquota.trans_inode
+++ b/018.ugquota.trans_inode
@@ -1,9 +1,9 @@
-### xfs_logprint -t -i -s 2 output ###
+### xfs_logprint -t -i -s START output ###
 xfs_logprint:
  data device: <DEVICE>
  log device: <DEVICE> daddr: <DADDR> length: <LENGTH>
  log tail: <COUNT> head: <COUNT> state: <CLEAN>
- override tail: 2
+ override tail: <TAIL_BLK>
 TRANS: tid:<TID> type:QM_QINOCREATE #items:4 trans:0x0 q:<Q>
 BUF: cnt:2 total:2 a:<A> len:<LEN> a:<A> len:<LEN>
        BUF: #regs:2 start blkno:<BLKNO> len:<LEN> bmap size:1