generic: test accurate shared extent reporting
diff mbox

Message ID 20160805072147.GG25565@birch.djwong.org
State Not Applicable, archived
Headers show

Commit Message

Darrick J. Wong Aug. 5, 2016, 7:21 a.m. UTC
Ensure that we can create a file with a single extent, reflink two
blocks out of the middle of that extent, and the resulting fiemap
reports two shared extents, instead of lazily reporting the entire
huge extent as shared.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 tests/generic/929     |   89 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/generic/929.out |   17 +++++++++
 tests/generic/group   |    1 +
 3 files changed, 107 insertions(+)
 create mode 100755 tests/generic/929
 create mode 100644 tests/generic/929.out

Comments

Eryu Guan Aug. 5, 2016, 7:46 a.m. UTC | #1
On Fri, Aug 05, 2016 at 12:21:47AM -0700, Darrick J. Wong wrote:
> Ensure that we can create a file with a single extent, reflink two
> blocks out of the middle of that extent, and the resulting fiemap
> reports two shared extents, instead of lazily reporting the entire
> huge extent as shared.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>  tests/generic/929     |   89 +++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/generic/929.out |   17 +++++++++
>  tests/generic/group   |    1 +
>  3 files changed, 107 insertions(+)
>  create mode 100755 tests/generic/929
>  create mode 100644 tests/generic/929.out
> 
> diff --git a/tests/generic/929 b/tests/generic/929
> new file mode 100755
> index 0000000..9793be0
> --- /dev/null
> +++ b/tests/generic/929
> @@ -0,0 +1,89 @@
> +#! /bin/bash
> +# FS QA Test No. 929
> +#
> +# Check that bmap/fiemap accurately report shared extents.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +#-----------------------------------------------------------------------
> +#
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1	# failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 7 15
> +
> +_cleanup()
> +{
> +	cd /
> +	rm -rf $tmp.*
> +	wait
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/reflink
> +
> +# real QA test starts here
> +_supported_os Linux

Need "_supported_fs generic"

> +_require_scratch_reflink
> +_require_fiemap
> +
> +echo "Format and mount"
> +_scratch_mkfs > $seqres.full 2>&1
> +_scratch_mount >> $seqres.full 2>&1
> +
> +testdir=$SCRATCH_MNT/test-$seq
> +mkdir $testdir
> +
> +blocks=5
> +blksz=65536
> +sz=$((blocks * blksz))
> +
> +echo "Create the original files"
> +$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file1 >> $seqres.full
> +_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
> +_scratch_cycle_mount
> +
> +echo "file1 extents and holes"
> +_count_extents $testdir/file1
> +_count_holes $testdir/file1
> +
> +_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 3)) $blksz >> $seqres.full
> +_reflink_range $testdir/file1 $((blksz * 3)) $testdir/file2 $blksz $blksz >> $seqres.full
> +_scratch_cycle_mount
> +
> +echo "Compare files"
> +md5sum $testdir/file1 | _filter_scratch
> +md5sum $testdir/file2 | _filter_scratch
> +
> +echo "file1 extents and holes"
> +_count_extents $testdir/file1
> +_count_holes $testdir/file1
> +echo "file2 extents and holes"
> +_count_extents $testdir/file2
> +_count_holes $testdir/file2
> +echo "file1 shared extents"
> +$XFS_IO_PROG -c 'fiemap -v' $testdir/file1 | awk '{print $5}' | grep '0x.*[2367aAbBfF]...$' -c

Missing a command at the end?

Thanks,
Eryu

> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/generic/929.out b/tests/generic/929.out
> new file mode 100644
> index 0000000..e290f4c
> --- /dev/null
> +++ b/tests/generic/929.out
> @@ -0,0 +1,17 @@
> +QA output created by 929
> +Format and mount
> +Create the original files
> +file1 extents and holes
> +1
> +0
> +Compare files
> +17af09af790a9b4c79cddf72f6b642cb  SCRATCH_MNT/test-929/file1
> +79418df9c55ab7f58781cb7b9e7d5d91  SCRATCH_MNT/test-929/file2
> +file1 extents and holes
> +5
> +0
> +file2 extents and holes
> +2
> +2
> +file1 shared extents
> +2
> diff --git a/tests/generic/group b/tests/generic/group
> index 18b9775..732f6f6 100644
> --- a/tests/generic/group
> +++ b/tests/generic/group
> @@ -375,3 +375,4 @@
>  370 auto quick richacl
>  927 auto quick clone
>  928 auto quick clone dedupe
> +929 auto quick clone
Darrick J. Wong Aug. 5, 2016, 8:02 a.m. UTC | #2
On Fri, Aug 05, 2016 at 03:46:07PM +0800, Eryu Guan wrote:
> On Fri, Aug 05, 2016 at 12:21:47AM -0700, Darrick J. Wong wrote:
> > Ensure that we can create a file with a single extent, reflink two
> > blocks out of the middle of that extent, and the resulting fiemap
> > reports two shared extents, instead of lazily reporting the entire
> > huge extent as shared.
> > 
> > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> > ---
> >  tests/generic/929     |   89 +++++++++++++++++++++++++++++++++++++++++++++++++
> >  tests/generic/929.out |   17 +++++++++
> >  tests/generic/group   |    1 +
> >  3 files changed, 107 insertions(+)
> >  create mode 100755 tests/generic/929
> >  create mode 100644 tests/generic/929.out
> > 
> > diff --git a/tests/generic/929 b/tests/generic/929
> > new file mode 100755
> > index 0000000..9793be0
> > --- /dev/null
> > +++ b/tests/generic/929
> > @@ -0,0 +1,89 @@
> > +#! /bin/bash
> > +# FS QA Test No. 929
> > +#
> > +# Check that bmap/fiemap accurately report shared extents.
> > +#
> > +#-----------------------------------------------------------------------
> > +# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
> > +#
> > +# This program is free software; you can redistribute it and/or
> > +# modify it under the terms of the GNU General Public License as
> > +# published by the Free Software Foundation.
> > +#
> > +# This program is distributed in the hope that it would be useful,
> > +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > +# GNU General Public License for more details.
> > +#
> > +# You should have received a copy of the GNU General Public License
> > +# along with this program; if not, write the Free Software Foundation,
> > +# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> > +#-----------------------------------------------------------------------
> > +#
> > +
> > +seq=`basename $0`
> > +seqres=$RESULT_DIR/$seq
> > +echo "QA output created by $seq"
> > +
> > +here=`pwd`
> > +tmp=/tmp/$$
> > +status=1	# failure is the default!
> > +trap "_cleanup; exit \$status" 0 1 2 3 7 15
> > +
> > +_cleanup()
> > +{
> > +	cd /
> > +	rm -rf $tmp.*
> > +	wait
> > +}
> > +
> > +# get standard environment, filters and checks
> > +. ./common/rc
> > +. ./common/filter
> > +. ./common/reflink
> > +
> > +# real QA test starts here
> > +_supported_os Linux
> 
> Need "_supported_fs generic"

Ok.

> > +_require_scratch_reflink
> > +_require_fiemap
> > +
> > +echo "Format and mount"
> > +_scratch_mkfs > $seqres.full 2>&1
> > +_scratch_mount >> $seqres.full 2>&1
> > +
> > +testdir=$SCRATCH_MNT/test-$seq
> > +mkdir $testdir
> > +
> > +blocks=5
> > +blksz=65536
> > +sz=$((blocks * blksz))
> > +
> > +echo "Create the original files"
> > +$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file1 >> $seqres.full
> > +_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
> > +_scratch_cycle_mount
> > +
> > +echo "file1 extents and holes"
> > +_count_extents $testdir/file1
> > +_count_holes $testdir/file1
> > +
> > +_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 3)) $blksz >> $seqres.full
> > +_reflink_range $testdir/file1 $((blksz * 3)) $testdir/file2 $blksz $blksz >> $seqres.full
> > +_scratch_cycle_mount
> > +
> > +echo "Compare files"
> > +md5sum $testdir/file1 | _filter_scratch
> > +md5sum $testdir/file2 | _filter_scratch
> > +
> > +echo "file1 extents and holes"
> > +_count_extents $testdir/file1
> > +_count_holes $testdir/file1
> > +echo "file2 extents and holes"
> > +_count_extents $testdir/file2
> > +_count_holes $testdir/file2
> > +echo "file1 shared extents"
> > +$XFS_IO_PROG -c 'fiemap -v' $testdir/file1 | awk '{print $5}' | grep '0x.*[2367aAbBfF]...$' -c
> 
> Missing a command at the end?

Nope, it echoes the number of shared extents (that's what that awk and grep
globule does), which /should/ be exactly 2.

(Unless I'm missing something?)

--D

> 
> Thanks,
> Eryu
> 
> > +
> > +# success, all done
> > +status=0
> > +exit
> > diff --git a/tests/generic/929.out b/tests/generic/929.out
> > new file mode 100644
> > index 0000000..e290f4c
> > --- /dev/null
> > +++ b/tests/generic/929.out
> > @@ -0,0 +1,17 @@
> > +QA output created by 929
> > +Format and mount
> > +Create the original files
> > +file1 extents and holes
> > +1
> > +0
> > +Compare files
> > +17af09af790a9b4c79cddf72f6b642cb  SCRATCH_MNT/test-929/file1
> > +79418df9c55ab7f58781cb7b9e7d5d91  SCRATCH_MNT/test-929/file2
> > +file1 extents and holes
> > +5
> > +0
> > +file2 extents and holes
> > +2
> > +2
> > +file1 shared extents
> > +2
> > diff --git a/tests/generic/group b/tests/generic/group
> > index 18b9775..732f6f6 100644
> > --- a/tests/generic/group
> > +++ b/tests/generic/group
> > @@ -375,3 +375,4 @@
> >  370 auto quick richacl
> >  927 auto quick clone
> >  928 auto quick clone dedupe
> > +929 auto quick clone
> --
> 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
Eryu Guan Aug. 5, 2016, 8:14 a.m. UTC | #3
On Fri, Aug 05, 2016 at 01:02:12AM -0700, Darrick J. Wong wrote:
> On Fri, Aug 05, 2016 at 03:46:07PM +0800, Eryu Guan wrote:
> > On Fri, Aug 05, 2016 at 12:21:47AM -0700, Darrick J. Wong wrote:

> > > +_count_holes $testdir/file2
> > > +echo "file1 shared extents"
> > > +$XFS_IO_PROG -c 'fiemap -v' $testdir/file1 | awk '{print $5}' | grep '0x.*[2367aAbBfF]...$' -c
> > 
> > Missing a command at the end?
> 
> Nope, it echoes the number of shared extents (that's what that awk and grep
> globule does), which /should/ be exactly 2.
> 
> (Unless I'm missing something?)

Ah, thanks! I saw "-c" at the end and thought it was part of xfs_io
command without looking at it carefully.

Thanks,
Eryu

Patch
diff mbox

diff --git a/tests/generic/929 b/tests/generic/929
new file mode 100755
index 0000000..9793be0
--- /dev/null
+++ b/tests/generic/929
@@ -0,0 +1,89 @@ 
+#! /bin/bash
+# FS QA Test No. 929
+#
+# Check that bmap/fiemap accurately report shared extents.
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2016 Oracle, Inc.  All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#-----------------------------------------------------------------------
+#
+
+seq=`basename $0`
+seqres=$RESULT_DIR/$seq
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 7 15
+
+_cleanup()
+{
+	cd /
+	rm -rf $tmp.*
+	wait
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/reflink
+
+# real QA test starts here
+_supported_os Linux
+_require_scratch_reflink
+_require_fiemap
+
+echo "Format and mount"
+_scratch_mkfs > $seqres.full 2>&1
+_scratch_mount >> $seqres.full 2>&1
+
+testdir=$SCRATCH_MNT/test-$seq
+mkdir $testdir
+
+blocks=5
+blksz=65536
+sz=$((blocks * blksz))
+
+echo "Create the original files"
+$XFS_IO_PROG -f -c "falloc 0 $sz" $testdir/file1 >> $seqres.full
+_pwrite_byte 0x61 0 $sz $testdir/file1 >> $seqres.full
+_scratch_cycle_mount
+
+echo "file1 extents and holes"
+_count_extents $testdir/file1
+_count_holes $testdir/file1
+
+_reflink_range $testdir/file1 $blksz $testdir/file2 $((blksz * 3)) $blksz >> $seqres.full
+_reflink_range $testdir/file1 $((blksz * 3)) $testdir/file2 $blksz $blksz >> $seqres.full
+_scratch_cycle_mount
+
+echo "Compare files"
+md5sum $testdir/file1 | _filter_scratch
+md5sum $testdir/file2 | _filter_scratch
+
+echo "file1 extents and holes"
+_count_extents $testdir/file1
+_count_holes $testdir/file1
+echo "file2 extents and holes"
+_count_extents $testdir/file2
+_count_holes $testdir/file2
+echo "file1 shared extents"
+$XFS_IO_PROG -c 'fiemap -v' $testdir/file1 | awk '{print $5}' | grep '0x.*[2367aAbBfF]...$' -c
+
+# success, all done
+status=0
+exit
diff --git a/tests/generic/929.out b/tests/generic/929.out
new file mode 100644
index 0000000..e290f4c
--- /dev/null
+++ b/tests/generic/929.out
@@ -0,0 +1,17 @@ 
+QA output created by 929
+Format and mount
+Create the original files
+file1 extents and holes
+1
+0
+Compare files
+17af09af790a9b4c79cddf72f6b642cb  SCRATCH_MNT/test-929/file1
+79418df9c55ab7f58781cb7b9e7d5d91  SCRATCH_MNT/test-929/file2
+file1 extents and holes
+5
+0
+file2 extents and holes
+2
+2
+file1 shared extents
+2
diff --git a/tests/generic/group b/tests/generic/group
index 18b9775..732f6f6 100644
--- a/tests/generic/group
+++ b/tests/generic/group
@@ -375,3 +375,4 @@ 
 370 auto quick richacl
 927 auto quick clone
 928 auto quick clone dedupe
+929 auto quick clone