From: Brian Foster <bfoster@redhat.com>
To: Dave Chinner <david@fromorbit.com>
Cc: fstests@vger.kernel.org
Subject: Re: [PATCH 2/4] xfs: don't output mkfs sector sizes into golden output
Date: Fri, 27 Feb 2015 13:56:50 -0500 [thread overview]
Message-ID: <20150227185650.GA17531@laptop.bfoster> (raw)
In-Reply-To: <1424818479-10083-3-git-send-email-david@fromorbit.com>
On Wed, Feb 25, 2015 at 09:54:37AM +1100, Dave Chinner wrote:
> From: Dave Chinner <dchinner@redhat.com>
>
> The mkfs sector sizes are dependent on the underlying device in use,
> and so is not fixed. hence it needs to be filtered from any golden
> output file, otherwise tests that just differ by sector size will
> fail.
>
> Signed-off-by: Dave Chinner <dchinner@redhat.com>
> ---
> tests/xfs/096 | 8 ++++++--
> tests/xfs/096.external | 15 +++++++--------
> tests/xfs/096.internal | 16 ++++++++--------
> tests/xfs/119 | 2 +-
> tests/xfs/206 | 33 +++++++++++++++------------------
> 5 files changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/tests/xfs/096 b/tests/xfs/096
> index 0ecf88f..2da8fa1 100755
> --- a/tests/xfs/096
> +++ b/tests/xfs/096
> @@ -47,6 +47,8 @@ _cleanup()
> #
> # filter out counts which will vary
> # - extsz, blocks, agsize, agcount, device name, rtextents
> +# - log version varies for crc enabled fs
> +# - lsunit varies for 512/4k sector devices
> # filter out differences between linux and irix:
> # - sectsz on Linux
> # - mmr, mixed-case on IRIX
> @@ -63,7 +65,7 @@ _cleanup()
> # = sunit=0 blks
> # realtime =none extsz=65536 blocks=N, rtextents=N
> #
> -_mkfs_filter()
> +mkfs_filter()
> {
> tee -a $seqres.full | \
> sed \
> @@ -80,6 +82,8 @@ _mkfs_filter()
> -e '/ *= *mmr=[0-9][0-9]* *$/d' \
> -e 's/ *mixed-case=[YN]//' \
> -e 's/ *ascii-ci=[01]//' \
> + -e 's/\(version=\)\([12]\)/\1N/' \
> + -e 's/\(sunit=\)\([018] blks\)/\1N blks/' \
> -e 's/sectsz=[0-9][0-9]* *//' \
> -e 's/, lazy-count.*//' \
> -e '/inode-paths/d' \
> @@ -145,7 +149,7 @@ do
> fi
> echo "--- mkfs=$mkfs ---"
> export MKFS_OPTIONS="$mkfs"
> - _scratch_mkfs_xfs 2>&1 | _mkfs_filter
> + _scratch_mkfs_xfs 2>&1 | mkfs_filter
> echo ""
> echo ""
> done
> diff --git a/tests/xfs/096.external b/tests/xfs/096.external
> index 95833c8..7923340 100644
> --- a/tests/xfs/096.external
> +++ b/tests/xfs/096.external
> @@ -11,8 +11,7 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=0 swidth=0 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=2
> - = sunit=8 blks
> +log =LOG bsize=4096 blocks=N, version=N
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -22,8 +21,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=2
> - = sunit=0 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -33,8 +32,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=1
> - = sunit=0 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -44,8 +43,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=1
> - = sunit=0 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> diff --git a/tests/xfs/096.internal b/tests/xfs/096.internal
> index 7bf848c..eaba13f 100644
> --- a/tests/xfs/096.internal
> +++ b/tests/xfs/096.internal
> @@ -11,8 +11,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=0 swidth=0 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=2
> - = sunit=8 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -22,8 +22,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=2
> - = sunit=8 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -33,8 +33,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=1
> - = sunit=0 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> @@ -44,8 +44,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
> data = bsize=4096 blocks=N, imaxpct=N
> = sunit=65 swidth=65 blks, unwritten=1
> naming =version 2 bsize=4096
> -log =LOG bsize=4096 blocks=N, version=1
> - = sunit=0 blks
> +log =LOG bsize=4096 blocks=N, version=N
> + = sunit=N blks
> realtime =REALTIME extsz=N, blocks=N, rtextents=N
>
>
> diff --git a/tests/xfs/119 b/tests/xfs/119
> index 490495b..156d5e4 100755
> --- a/tests/xfs/119
> +++ b/tests/xfs/119
> @@ -54,7 +54,7 @@ _require_scratch
> # this may hang
> sync
>
> -export MKFS_OPTIONS="-l version=2,size=2500b,su=64k"
> +export MKFS_OPTIONS="-l version=2,size=2560b,su=64k"
Not clear if this was intended to be part of the previous patch?
Anyways, still a trailing space here. Otherwise this looks fine to me:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> export MOUNT_OPTIONS="-o logbsize=64k"
> _scratch_mkfs_xfs >/dev/null
>
> diff --git a/tests/xfs/206 b/tests/xfs/206
> index f6dcca6..198e413 100755
> --- a/tests/xfs/206
> +++ b/tests/xfs/206
> @@ -73,34 +73,31 @@ echo "=== truncate file ==="
> dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \
> || _fail "!!! failed to truncate loopback file to correct size"
>
> +mkfs_filter()
> +{
> + sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
> + -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
> + -e "s/, projid32bit=[0-9]//" \
> + -e "s/ ftype=[0-9]//" \
> + -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \
> + -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
> + -e "/.*crc=/d"
> +}
> +
> # 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" \
> - -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
> - -e "s/, projid32bit=[0-9]//" \
> - -e "s/ ftype=[0-9]//" \
> - -e "/.*crc=/d"
> +mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b \
> + -llazy-count=0 $tmpfile | mkfs_filter
>
> 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" \
> - -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
> - -e "s/, projid32bit=[0-9]//" \
> - -e "s/ ftype=[0-9]//" \
> - -e "/.*crc=/d"
> +xfs_growfs $tmpdir | mkfs_filter
>
> # and double-check the new geometry
> echo "=== xfs_info ==="
> -xfs_info $tmpdir \
> - | sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
> - -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
> - -e "s/, projid32bit=[0-9]//" \
> - -e "s/ ftype=[0-9]//" \
> - -e "/.*crc=/d"
> +xfs_info $tmpdir | mkfs_filter
>
> # _cleanup cleans up for us
>
> --
> 2.0.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-02-27 18:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-24 22:54 [PATCH v2 0/4] fstests: sector size fixes and whiteouts Dave Chinner
2015-02-24 22:54 ` [PATCH 1/4] xfs/104: log size too small for 4k sector drives Dave Chinner
2015-02-25 16:11 ` Brian Foster
2015-02-25 22:32 ` ramdisk problems in 4.0-rc1? (was Re: [PATCH 1/4] xfs/104: log size too small for 4k sector drives) Dave Chinner
2015-02-25 23:31 ` Brian Foster
2015-02-25 23:43 ` Dave Chinner
2015-02-26 7:46 ` Boaz Harrosh
2015-02-26 17:23 ` Brian Foster
2015-03-01 8:49 ` Boaz Harrosh
2015-03-01 14:28 ` Brian Foster
2015-02-27 0:58 ` Dave Chinner
2015-03-01 8:27 ` Boaz Harrosh
2015-03-02 1:09 ` Dave Chinner
2015-03-02 9:40 ` Boaz Harrosh
2015-02-26 8:14 ` [PATCH] brd: Re-instate ram disk visibility option (part_show) Boaz Harrosh
2015-02-26 8:41 ` [PATCH] brd: Only request 4K sectors if DAX is enabled Boaz Harrosh
2015-02-26 8:48 ` Boaz Harrosh
2015-02-27 0:23 ` Dave Chinner
2015-03-01 8:30 ` Boaz Harrosh
2015-02-24 22:54 ` [PATCH 2/4] xfs: don't output mkfs sector sizes into golden output Dave Chinner
2015-02-27 18:56 ` Brian Foster [this message]
2015-02-24 22:54 ` [PATCH 3/4] xfs/049: umount -d fails when kernel wins teardown race Dave Chinner
2015-02-27 18:56 ` Brian Foster
2015-02-24 22:54 ` [PATCH 4/4] generic: Add rudimetary RENAME_WHITEOUT test Dave Chinner
2015-02-27 18:57 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2015-02-24 7:20 [PATCH 0/4] fstests: sector size fixes and whiteouts Dave Chinner
2015-02-24 7:20 ` [PATCH 2/4] xfs: don't output mkfs sector sizes into golden output Dave Chinner
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=20150227185650.GA17531@laptop.bfoster \
--to=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=fstests@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.