xfstests: enforce lazy-count=0 in log tests 018, 081, 082
PATCH 1/1 xfstests: enforce lazy-count=0 in log tests 018, 081, 082
I was experimenting w/ default lazy-count=1, and it broke a few tests. Seems simplest to enforce lazy-count=0 in the common.log routines for now, and fix up the output? (vs. updating all the expected output for these tests...)
---
common.log +1 -1
@@ -272,7 +272,7 @@ _mkfs_log() { # create the FS # mkfs options to append to log size otion can be specified ($*) - export MKFS_OPTIONS="-l size=2000b $*" + export MKFS_OPTIONS="-l size=2000b -l lazy-count=0 $*" _full "mkfs" _scratch_mkfs_xfs >>$seq.full 2>&1 if [ $? -ne 0 ] ; then diff --git a/018.out b/018.out
index 53840f0..3118b6e 100644
018.out +15 -15
@@ -1,17 +1,17 @@ QA output created by 018 *** init FS -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered -*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered -*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered -*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered +*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=1.filtered +*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=1.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=1.filtered +*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-llazy-count=0-lversion=2.filtered
081.out +1 -1
@@ -1,4 +1,4 @@ QA output created by 081 *** init FS -*** compare logprint: 081.ugquota.trans_inode with 081.fulldir/trans_inode.mnt-oquota,gquota.mkfs-lsize=2000b-lversion=1.filtered +*** compare logprint: 081.ugquota.trans_inode with 081.fulldir/trans_inode.mnt-oquota,gquota.mkfs-lsize=2000b-llazy-count=0-lversion=1.filtered *** unmount
082.out +19 -19
@@ -1,39 +1,39 @@ QA output created by 082 *** init FS --- mkfs=version=2, mnt=logbsize=32k, sync=sync --- -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.sync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.sync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.sync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.sync.filtered --- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=sync --- -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.sync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.sync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=4096.sync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=4096.sync.filtered --- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=sync --- -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.sync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.sync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=32768.sync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=32768.sync.filtered --- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=sync --- -*** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=36864 *** +*** Cannot mkfs for this test using option specified: -l size=2000b -l lazy-count=0 -l version=2,su=36864 *** --- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=sync --- -*** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=5120 *** +*** Cannot mkfs for this test using option specified: -l size=2000b -l lazy-count=0 -l version=2,su=5120 *** --- mkfs=version=2, mnt=logbsize=32k, sync=nosync --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered +*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.nosync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.nosync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2.nosync.filtered --- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=nosync --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered +*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=4096.nosync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=4096.nosync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=4096.nosync.filtered --- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=nosync --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered -*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered -*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered +*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=32768.nosync.filtered +*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=32768.nosync.filtered +*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-llazy-count=0-lversion=2,su=32768.nosync.filtered --- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=nosync --- -*** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=36864 *** +*** Cannot mkfs for this test using option specified: -l size=2000b -l lazy-count=0 -l version=2,su=36864 *** --- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=nosync --- -*** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=5120 *** +*** Cannot mkfs for this test using option specified: -l size=2000b -l lazy-count=0 -l version=2,su=5120 ***
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 6 lines · Eric Sandeen
I was experimenting w/ default lazy-count=1, and it broke a few tests. Seems simplest to enforce lazy-count=0 in the common.log routines for now, and fix up the output? (vs. updating all the expected output for these tests...)
Signed-off-by Eric Sandeen <[email protected]>
Hrm...are there any tests that explicitly check lazy-count=1?
Josef 'Jeff' Sipek.
Signature · 8 lines
Mankind invented the atomic bomb, but no mouse would ever construct a mousetrap. - Albert Einstein _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 9 lines · Josef 'Jeff' Sipek
Quoted 6 lines · Eric Sandeen
I was experimenting w/ default lazy-count=1, and it broke a few tests. Seems simplest to enforce lazy-count=0 in the common.log routines for now, and fix up the output? (vs. updating all the expected output for these tests...)
Signed-off-by Eric Sandeen <[email protected]>Hrm...are there any tests that explicitly check lazy-count=1?
not that I know of, but you can set it in MKFS_OPTIONS or something like that, IIRC.
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 4 lines · Eric Sandeen
I was experimenting w/ default lazy-count=1, and it broke a few tests. Seems simplest to enforce lazy-count=0 in the common.log routines for now, and fix up the output? (vs. updating all the expected output for these tests...)
Didn't you just send a patch to make lazy-count=1 the default? :)
I'd rather see either a filter dealing with both variants or make sure we always test the newer and more important case (lazy-count=1) here.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 11 lines · Christoph Hellwig
Quoted 4 lines · Eric Sandeen
I was experimenting w/ default lazy-count=1, and it broke a few tests. Seems simplest to enforce lazy-count=0 in the common.log routines for now, and fix up the output? (vs. updating all the expected output for these tests...)
Didn't you just send a patch to make lazy-count=1 the default? :)
I'd rather see either a filter dealing with both variants or make sure we always test the newer and more important case (lazy-count=1) here.
I don't think that a filter will be possible, it pretty fundamentally changes log traffic doesn't it? I could make 2 expected outputs, perhaps, one for each... I'll double check though.
I just made it forced to 0 because I don't think these tests are really testing anything relevant to whether or not lazy-count is enabled...
-Eric
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs