FSTests Archive on lore.kernel.org
 help / color / Atom feed
From: Filipe Manana <fdmanana@kernel.org>
To: Eryu Guan <guaneryu@gmail.com>
Cc: fstests <fstests@vger.kernel.org>,
	linux-btrfs <linux-btrfs@vger.kernel.org>,
	Filipe Manana <fdmanana@suse.com>
Subject: Re: [PATCH] btrfs: test that send can issue clone operations within the same file
Date: Tue, 5 Nov 2019 14:56:07 +0000
Message-ID: <CAL3q7H5GvQeTyc=5y85sPnLKAzyqvRjJBOoxLQvHDEjpWR3MrQ@mail.gmail.com> (raw)
In-Reply-To: <20191102062625.GG2543@desktop>

On Sat, Nov 2, 2019 at 6:26 AM Eryu Guan <guaneryu@gmail.com> wrote:
>
> On Wed, Oct 30, 2019 at 12:27:41PM +0000, fdmanana@kernel.org wrote:
> > From: Filipe Manana <fdmanana@suse.com>
> >
> > Verify that both full and incremental send operations can issue clone
> > operations when a file has extents that are shared with itself (at
> > different offsets of course).
> >
> > This currently fails on btrfs but is addressed by a patch for the
> > kernel titled:
> >
> >   "Btrfs: send, allow clone operations within the same file"
> >
> > Signed-off-by: Filipe Manana <fdmanana@suse.com>
> > ---
> >  tests/btrfs/200     | 133 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/btrfs/200.out |  17 +++++++
> >  tests/btrfs/group   |   1 +
> >  3 files changed, 151 insertions(+)
> >  create mode 100755 tests/btrfs/200
> >  create mode 100644 tests/btrfs/200.out
> >
> > diff --git a/tests/btrfs/200 b/tests/btrfs/200
> > new file mode 100755
> > index 00000000..e7853c4b
> > --- /dev/null
> > +++ b/tests/btrfs/200
> > @@ -0,0 +1,133 @@
> > +#! /bin/bash
> > +# SPDX-License-Identifier: GPL-2.0
> > +# Copyright (C) 2019 SUSE Linux Products GmbH. All Rights Reserved.
> > +#
> > +# FS QA Test No. 200
> > +#
> > +# Check that send operations (full and incremental) are able to issue clone
> > +# operations for extents that are shared between the same file.
> > +#
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +tmp=/tmp/$$
> > +status=1     # failure is the default!
> > +trap "_cleanup; exit \$status" 0 1 2 3 15
> > +
> > +_cleanup()
> > +{
> > +     cd /
> > +     rm -f $tmp.*
> > +     rm -fr $send_files_dir
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +. ./common/punch
> > +
> > +# real QA test starts here
> > +_supported_fs btrfs
> > +_supported_os Linux
> > +_require_fssum
> > +_require_test
> > +_require_scratch_reflink
> > +_require_xfs_io_command "fiemap"
> > +
> > +count_extents()
> > +{
> > +     $XFS_IO_PROG -r -c "fiemap" $1 | tail -n +2 | wc -l
> > +}
>
> There's a similar in common/rc called _count_extents(), but it opens
> file with rw permission. Perhaps you could just update the existing
> helper? (And add '-r' to _count_holes() and _count_attr_extents()?)

Indeed, I was looking at fiemap filters (in common/punch) searching
for such functionality, but apparently missed common/rc.
Yes, it serves well and it's basically the same I made.

>
> > +
> > +count_exclusive_extents()
> > +{
> > +     $XFS_IO_PROG -r -c "fiemap" $1 | tail -n +2 | cut -d ' ' -f 3 \
> > +             | sort | uniq | wc -l
> > +}
>
> And maybe add this one to common helper too.

Yes, I'll send a new patchset soon for that.

Thanks.

>
> Otherwise looks good to me.
>
> Thanks,
> Eryu
>
> > +
> > +send_files_dir=$TEST_DIR/btrfs-test-$seq
> > +
> > +rm -f $seqres.full
> > +rm -fr $send_files_dir
> > +mkdir $send_files_dir
> > +
> > +_scratch_mkfs >>$seqres.full 2>&1
> > +_scratch_mount
> > +
> > +# Create our first test file, which has an extent that is shared only with
> > +# itself and no other files. We want to verify a full send operation will
> > +# clone the extent.
> > +$XFS_IO_PROG -f -c "pwrite -S 0xb1 -b 64K 0 64K" $SCRATCH_MNT/foo \
> > +     | _filter_xfs_io
> > +$XFS_IO_PROG -c "reflink $SCRATCH_MNT/foo 0 64K 64K" $SCRATCH_MNT/foo \
> > +     | _filter_xfs_io
> > +
> > +# Create out second test file which initially, for the first send operation,
> > +# only has a single extent that is not shared.
> > +$XFS_IO_PROG -f -c "pwrite -S 0xc7 -b 64K 0 64K" $SCRATCH_MNT/bar \
> > +     | _filter_xfs_io
> > +
> > +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/base 2>&1 \
> > +     | _filter_scratch
> > +
> > +$BTRFS_UTIL_PROG send -f $send_files_dir/1.snap $SCRATCH_MNT/base 2>&1 \
> > +     | _filter_scratch
> > +
> > +# Now clone the existing extent in file bar to itself at a different offset.
> > +# We want to verify the incremental send operation below will issue a clone
> > +# operation instead of a write operation.
> > +$XFS_IO_PROG -c "reflink $SCRATCH_MNT/bar 0 64K 64K" $SCRATCH_MNT/bar \
> > +     | _filter_xfs_io
> > +
> > +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/incr 2>&1 \
> > +     | _filter_scratch
> > +
> > +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/base -f $send_files_dir/2.snap \
> > +     $SCRATCH_MNT/incr 2>&1 | _filter_scratch
> > +
> > +# Compute digests of the snapshot trees so that later we can compare against
> > +# digests of the trees in the new filesystem, to see if they match (no data or
> > +# metadata corruption happened).
> > +$FSSUM_PROG -A -f -w $send_files_dir/base.fssum $SCRATCH_MNT/base
> > +$FSSUM_PROG -A -f -w $send_files_dir/incr.fssum \
> > +     -x $SCRATCH_MNT/incr/base $SCRATCH_MNT/incr
> > +
> > +# Now recreate the filesystem by receiving both send streams and verify we get
> > +# the same file contents that the original filesystem had and that files foo
> > +# and bar have shared extents.
> > +_scratch_unmount
> > +_scratch_mkfs >>$seqres.full 2>&1
> > +_scratch_mount
> > +
> > +$BTRFS_UTIL_PROG receive -f $send_files_dir/1.snap $SCRATCH_MNT
> > +$BTRFS_UTIL_PROG receive -f $send_files_dir/2.snap $SCRATCH_MNT
> > +
> > +# Compute digests of the snapshot trees in the new filesystem and compare them
> > +# to the ones in the original filesystem, they must match.
> > +$FSSUM_PROG -r $send_files_dir/base.fssum $SCRATCH_MNT/base
> > +$FSSUM_PROG -r $send_files_dir/incr.fssum $SCRATCH_MNT/incr
> > +
> > +num_extents=$(count_extents $SCRATCH_MNT/base/foo)
> > +num_exclusive_extents=$(count_exclusive_extents $SCRATCH_MNT/base/foo)
> > +if [ $num_extents -ne 2 ] || [ $num_exclusive_extents -ne 1 ]; then
> > +     echo "File foo does not have 2 shared extents in the base snapshot"
> > +     $XFS_IO_PROG -r -c "fiemap" $SCRATCH_MNT/base/foo
> > +fi
> > +
> > +num_extents=$(count_extents $SCRATCH_MNT/incr/foo)
> > +num_exclusive_extents=$(count_exclusive_extents $SCRATCH_MNT/incr/foo)
> > +if [ $num_extents -ne 2 ] || [ $num_exclusive_extents -ne 1 ]; then
> > +     echo "File foo does not have 2 shared extents in the incr snapshot"
> > +     $XFS_IO_PROG -r -c "fiemap" $SCRATCH_MNT/incr/foo
> > +fi
> > +
> > +num_extents=$(count_extents $SCRATCH_MNT/incr/bar)
> > +num_exclusive_extents=$(count_exclusive_extents $SCRATCH_MNT/incr/bar)
> > +if [ $num_extents -ne 2 ] || [ $num_exclusive_extents -ne 1 ]; then
> > +     echo "File bar does not have 2 shared extents in the incr snapshot"
> > +     $XFS_IO_PROG -r -c "fiemap" $SCRATCH_MNT/incr/bar
> > +fi
> > +
> > +status=0
> > +exit
> > diff --git a/tests/btrfs/200.out b/tests/btrfs/200.out
> > new file mode 100644
> > index 00000000..3eec567e
> > --- /dev/null
> > +++ b/tests/btrfs/200.out
> > @@ -0,0 +1,17 @@
> > +QA output created by 200
> > +wrote 65536/65536 bytes at offset 0
> > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +linked 65536/65536 bytes at offset 65536
> > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +wrote 65536/65536 bytes at offset 0
> > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +Create a readonly snapshot of 'SCRATCH_MNT' in 'SCRATCH_MNT/base'
> > +At subvol SCRATCH_MNT/base
> > +linked 65536/65536 bytes at offset 65536
> > +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +Create a readonly snapshot of 'SCRATCH_MNT' in 'SCRATCH_MNT/incr'
> > +At subvol SCRATCH_MNT/incr
> > +At subvol base
> > +At snapshot incr
> > +OK
> > +OK
> > diff --git a/tests/btrfs/group b/tests/btrfs/group
> > index c7ab129e..d56dcafa 100644
> > --- a/tests/btrfs/group
> > +++ b/tests/btrfs/group
> > @@ -202,3 +202,4 @@
> >  197 auto quick volume
> >  198 auto quick volume
> >  199 auto quick trim
> > +200 auto quick send clone
> > --
> > 2.11.0
> >

      reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-30 12:27 fdmanana
2019-11-01 14:56 ` David Sterba
2019-11-02  6:26 ` Eryu Guan
2019-11-05 14:56   ` Filipe Manana [this message]

Reply instructions:

You may reply publically 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='CAL3q7H5GvQeTyc=5y85sPnLKAzyqvRjJBOoxLQvHDEjpWR3MrQ@mail.gmail.com' \
    --to=fdmanana@kernel.org \
    --cc=fdmanana@suse.com \
    --cc=fstests@vger.kernel.org \
    --cc=guaneryu@gmail.com \
    --cc=linux-btrfs@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

FSTests Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/fstests/0 fstests/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 fstests fstests/ https://lore.kernel.org/fstests \
		fstests@vger.kernel.org
	public-inbox-index fstests

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.fstests


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git