public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Subject: [PATCH 3/4] xfsqa: filter log size in 206
Date: Tue, 12 Jan 2010 15:41:08 +1100	[thread overview]
Message-ID: <1263271269-18997-4-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1263271269-18997-1-git-send-email-david@fromorbit.com>

With the log size now going past 128MB, test 206 creates a filesystem
with a much larger log than 128MB. The golden output expects at
128MB log size, so the test breaks. Filter the log size out of the
mkfs output and golden output so that the test works on both older and
newer mkfs binaries.

Signed-off-by: Dave Chinner <david@fromorbit.com>
---
 206     |    9 ++++++---
 206.out |    6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/206 b/206
index b1b2286..0935335 100755
--- a/206
+++ b/206
@@ -75,19 +75,22 @@ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \
 # mkfs slightly smaller than that
 echo "=== mkfs.xfs ==="
 mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 $tmpfile \
-	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g"
+	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
+		-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
 
 mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
 
 # see what happens when we growfs it
 echo "=== xfs_growfs ==="
 xfs_growfs $tmpdir \
-	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g"
+	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
+		-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
 
 # and double-check the new geometry
 echo "=== xfs_info ==="
 xfs_info $tmpdir \
-	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g"
+	| sed -e "s,^meta-data=.*isize,meta-data=FILE                   isize,g" \
+		-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
 
 # _cleanup cleans up for us
 
diff --git a/206.out b/206.out
index 57d4f4e..da70d01 100644
--- a/206.out
+++ b/206.out
@@ -6,7 +6,7 @@ meta-data=FILE                   isize=256    agcount=52, agsize=76288719 blks
 data     =                       bsize=4096   blocks=3905982455, imaxpct=5
          =                       sunit=0      swidth=0 blks
 naming   =version 2              bsize=4096   ascii-ci=0
-log      =internal log           bsize=4096   blocks=32768, version=2
+log      =internal log           bsize=4096   blocks=XXXXX, version=2
          =                       sectsz=512   sunit=0 blks, lazy-count=0
 realtime =none                   extsz=4096   blocks=0, rtextents=0
 === xfs_growfs ===
@@ -15,7 +15,7 @@ meta-data=FILE                   isize=256    agcount=52, agsize=76288719 blks
 data     =                       bsize=4096   blocks=3905982455, imaxpct=5
          =                       sunit=0      swidth=0 blks
 naming   =version 2              bsize=4096   ascii-ci=0
-log      =internal               bsize=4096   blocks=32768, version=2
+log      =internal               bsize=4096   blocks=XXXXX, version=2
          =                       sectsz=512   sunit=0 blks, lazy-count=0
 realtime =none                   extsz=4096   blocks=0, rtextents=0
 data blocks changed from 3905982455 to 4882478016
@@ -25,6 +25,6 @@ meta-data=FILE                   isize=256    agcount=64, agsize=76288719 blks
 data     =                       bsize=4096   blocks=4882478016, imaxpct=5
          =                       sunit=0      swidth=0 blks
 naming   =version 2              bsize=4096   ascii-ci=0
-log      =internal               bsize=4096   blocks=32768, version=2
+log      =internal               bsize=4096   blocks=XXXXX, version=2
          =                       sectsz=512   sunit=0 blks, lazy-count=0
 realtime =none                   extsz=4096   blocks=0, rtextents=0
-- 
1.6.5

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2010-01-12  4:44 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-12  4:41 [PATCH 0/4] xfsqa: make some tests work again, add xfs_fsr test Dave Chinner
2010-01-12  4:41 ` [PATCH 1/4] xfsqa: filter the fsstress seed output in 104 Dave Chinner
2010-01-12  9:31   ` Christoph Hellwig
2010-01-12  4:41 ` [PATCH 2/4] xfsqa: make unmounting loop devices in 073 work again Dave Chinner
2010-01-12 10:00   ` Christoph Hellwig
2010-01-12 11:51     ` Dave Chinner
2010-01-12  4:41 ` Dave Chinner [this message]
2010-01-12  9:47   ` [PATCH 3/4] xfsqa: filter log size in 206 Christoph Hellwig
2010-01-12  4:41 ` [PATCH 4/4] xfsqa: add simple xfs_fsr test Dave Chinner
2010-01-12  9:50   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1263271269-18997-4-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox