Eric Sandeen
2013-May-23 16:36 UTC
[PATCH] xfstests: btrfs/308: simple sparse copy testcase for btrfs
From: Koen De Wit <koen.de.wit@oracle.com>
# Tests file clone functionality of btrfs ("reflinks"):
# - Reflink a file
# - Reflink the reflinked file
# - Modify the original file
# - Modify the reflinked file
[sandeen: add helpers, make several mostly-cosmetic
changes to the original testcase]
Signed-off-by: Koen De Wit <koen.de.wit@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
Originally submitted as test 297
diff --git a/common/rc b/common/rc
index fe6bbfc..4560715 100644
--- a/common/rc
+++ b/common/rc
@@ -2098,6 +2098,27 @@ _require_dumpe2fs()
fi
}
+_require_cp_reflink()
+{
+ cp --help | grep -q reflink || \
+ _notrun "This test requires a cp with --reflink support."
+}
+
+# Given 2 files, verify that they have the same mapping but different
+# inodes - i.e. an undisturbed reflink
+# Silent if so, make noise if not
+_verify_reflink()
+{
+ # not a hard link or symlink?
+ cmp -s <(stat -c ''%i'' $1) <(stat -c
''%i'' $2) \
+ && echo "$1 and $2 are not reflinks: same inode number"
+
+ # same mapping?
+ diff -u <($XFS_IO_PROG -F -c "fiemap" $1 | grep -v $1) \
+ <($XFS_IO_PROG -F -c "fiemap" $2 | grep -v $2) \
+ || echo "$1 and $2 are not reflinks: different extents"
+}
+
_create_loop_device()
{
file=$1
diff --git a/tests/btrfs/308 b/tests/btrfs/308
new file mode 100755
index 0000000..1bb8f02
--- /dev/null
+++ b/tests/btrfs/308
@@ -0,0 +1,87 @@
+#! /bin/bash
+# FS QA Test No. btrfs/308
+#
+# Tests file clone functionality of btrfs ("reflinks"):
+# - Reflink a file
+# - Reflink the reflinked file
+# - Modify the original file
+# - Modify the reflinked file
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013, Oracle and/or its affiliates. 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`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. common/rc
+. common/filter
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+
+_require_xfs_io_fiemap
+_require_cp_reflink
+
+TESTDIR1=$TEST_DIR/test-$seq
+rm -rf $TESTDIR1
+mkdir $TESTDIR1
+
+_checksum_files() {
+ for F in original copy1 copy2
+ do
+ md5sum $TESTDIR1/$F | _filter_test_dir
+ done
+}
+
+rm -f $seqres.full
+
+echo "Create the original file and reflink to copy1, copy2"
+$XFS_IO_PROG -F -f -c ''pwrite -S 0x61 0 9000''
$TESTDIR1/original >> $seqres.full 2>&1
+cp --reflink $TESTDIR1/original $TESTDIR1/copy1
+cp --reflink $TESTDIR1/copy1 $TESTDIR1/copy2
+_verify_reflink $TESTDIR1/original $TESTDIR1/copy1
+_verify_reflink $TESTDIR1/original $TESTDIR1/copy2
+echo "Original md5sums:"
+_checksum_files
+
+echo "Overwrite original file with new data"
+$XFS_IO_PROG -c ''pwrite -S 0x62 0 9000'' $TESTDIR1/original
>> $seqres.full 2>&1
+echo "md5sums after overwriting original:"
+_checksum_files
+
+echo "Overwrite copy1 with different new data"
+$XFS_IO_PROG -c ''pwrite -S 0x63 0 9000'' $TESTDIR1/copy1
>> $seqres.full 2>&1
+echo "md5sums after overwriting copy1:"
+_checksum_files
+
+# success, all done
+status=0
+exit
diff --git a/tests/btrfs/308.out b/tests/btrfs/308.out
new file mode 100644
index 0000000..7bccf08
--- /dev/null
+++ b/tests/btrfs/308.out
@@ -0,0 +1,16 @@
+QA output created by 308
+Create the original file and reflink to copy1, copy2
+Original md5sums:
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/original
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2
+Overwrite original file with new data
+md5sums after overwriting original:
+4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-308/original
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2
+Overwrite copy1 with different new data
+md5sums after overwriting copy1:
+4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-308/original
+e271cd47d9f62ebc96cb4e67ae4d16db TEST_DIR/test-308/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2
diff --git a/tests/btrfs/group b/tests/btrfs/group
index bc6c256..f24628c 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -9,3 +9,4 @@
276 auto rw metadata
284 auto
307 auto quick
+308 auto quick reflink
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
Dave Chinner
2013-May-23 23:39 UTC
Re: [PATCH] xfstests: btrfs/308: simple sparse copy testcase for btrfs
On Thu, May 23, 2013 at 11:36:32AM -0500, Eric Sandeen wrote:> From: Koen De Wit <koen.de.wit@oracle.com> > > # Tests file clone functionality of btrfs ("reflinks"): > # - Reflink a file > # - Reflink the reflinked file > # - Modify the original file > # - Modify the reflinked file > > [sandeen: add helpers, make several mostly-cosmetic > changes to the original testcase] > > Signed-off-by: Koen De Wit <koen.de.wit@oracle.com> > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- > > Originally submitted as test 297FWIW, this will conflict with Josef''s new btrfs/308 patch. You don''t have to use monatomically increasing numbers for the tests anymore in the fileystem specifc test directories - you could make these tests btrfs/00[1-4].... :) Cheers, Dave. -- Dave Chinner david@fromorbit.com -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Eryu Guan
2013-May-24 03:09 UTC
Re: [PATCH] xfstests: btrfs/308: simple sparse copy testcase for btrfs
On Thu, May 23, 2013 at 11:36:32AM -0500, Eric Sandeen wrote:> From: Koen De Wit <koen.de.wit@oracle.com> > > # Tests file clone functionality of btrfs ("reflinks"): > # - Reflink a file > # - Reflink the reflinked file > # - Modify the original file > # - Modify the reflinked file > > [sandeen: add helpers, make several mostly-cosmetic > changes to the original testcase] > > Signed-off-by: Koen De Wit <koen.de.wit@oracle.com> > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- > > Originally submitted as test 297 > > diff --git a/common/rc b/common/rc > index fe6bbfc..4560715 100644 > --- a/common/rc > +++ b/common/rc > @@ -2098,6 +2098,27 @@ _require_dumpe2fs() > fi > } > > +_require_cp_reflink() > +{ > + cp --help | grep -q reflink || \ > + _notrun "This test requires a cp with --reflink support." > +} > + > +# Given 2 files, verify that they have the same mapping but different > +# inodes - i.e. an undisturbed reflink > +# Silent if so, make noise if not > +_verify_reflink() > +{ > + # not a hard link or symlink? > + cmp -s <(stat -c ''%i'' $1) <(stat -c ''%i'' $2) \ > + && echo "$1 and $2 are not reflinks: same inode number" > + > + # same mapping? > + diff -u <($XFS_IO_PROG -F -c "fiemap" $1 | grep -v $1) \ > + <($XFS_IO_PROG -F -c "fiemap" $2 | grep -v $2) \ > + || echo "$1 and $2 are not reflinks: different extents"I''m not sure if "-F" is still needed after commit 96fce07 xfstests: automatically add -F to xfs_io on non-xfs> +} > + > _create_loop_device() > { > file=$1 > diff --git a/tests/btrfs/308 b/tests/btrfs/308 > new file mode 100755 > index 0000000..1bb8f02 > --- /dev/null > +++ b/tests/btrfs/308 > @@ -0,0 +1,87 @@ > +#! /bin/bash > +# FS QA Test No. btrfs/308 > +# > +# Tests file clone functionality of btrfs ("reflinks"): > +# - Reflink a file > +# - Reflink the reflinked file > +# - Modify the original file > +# - Modify the reflinked file > +# > +#----------------------------------------------------------------------- > +# Copyright (c) 2013, Oracle and/or its affiliates. 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` > +echo "QA output created by $seq" > + > +here=`pwd` > +tmp=/tmp/$$ > +status=1 # failure is the default! > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_cleanup() > +{ > + cd / > + rm -f $tmp.* > +} > + > +# get standard environment, filters and checks > +. common/rc > +. common/filter > + > +# real QA test starts here > +_supported_fs btrfs > +_supported_os Linux > + > +_require_xfs_io_fiemap > +_require_cp_reflink > + > +TESTDIR1=$TEST_DIR/test-$seq > +rm -rf $TESTDIR1 > +mkdir $TESTDIR1 > + > +_checksum_files() { > + for F in original copy1 copy2 > + do > + md5sum $TESTDIR1/$F | _filter_test_dir > + done > +} > + > +rm -f $seqres.full > + > +echo "Create the original file and reflink to copy1, copy2" > +$XFS_IO_PROG -F -f -c ''pwrite -S 0x61 0 9000'' $TESTDIR1/original >> $seqres.full 2>&1Here too, maybe we can drop "-F" option? Also 309 has this issue too. 310 and 311 are fine. Thanks, Eryu Guan> +cp --reflink $TESTDIR1/original $TESTDIR1/copy1 > +cp --reflink $TESTDIR1/copy1 $TESTDIR1/copy2 > +_verify_reflink $TESTDIR1/original $TESTDIR1/copy1 > +_verify_reflink $TESTDIR1/original $TESTDIR1/copy2 > +echo "Original md5sums:" > +_checksum_files > + > +echo "Overwrite original file with new data" > +$XFS_IO_PROG -c ''pwrite -S 0x62 0 9000'' $TESTDIR1/original >> $seqres.full 2>&1 > +echo "md5sums after overwriting original:" > +_checksum_files > + > +echo "Overwrite copy1 with different new data" > +$XFS_IO_PROG -c ''pwrite -S 0x63 0 9000'' $TESTDIR1/copy1 >> $seqres.full 2>&1 > +echo "md5sums after overwriting copy1:" > +_checksum_files > + > +# success, all done > +status=0 > +exit > diff --git a/tests/btrfs/308.out b/tests/btrfs/308.out > new file mode 100644 > index 0000000..7bccf08 > --- /dev/null > +++ b/tests/btrfs/308.out > @@ -0,0 +1,16 @@ > +QA output created by 308 > +Create the original file and reflink to copy1, copy2 > +Original md5sums: > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/original > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy1 > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2 > +Overwrite original file with new data > +md5sums after overwriting original: > +4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-308/original > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy1 > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2 > +Overwrite copy1 with different new data > +md5sums after overwriting copy1: > +4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-308/original > +e271cd47d9f62ebc96cb4e67ae4d16db TEST_DIR/test-308/copy1 > +42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-308/copy2 > diff --git a/tests/btrfs/group b/tests/btrfs/group > index bc6c256..f24628c 100644 > --- a/tests/btrfs/group > +++ b/tests/btrfs/group > @@ -9,3 +9,4 @@ > 276 auto rw metadata > 284 auto > 307 auto quick > +308 auto quick reflink > > _______________________________________________ > xfs mailing list > xfs@oss.sgi.com > http://oss.sgi.com/mailman/listinfo/xfs-- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Eric Sandeen
2013-May-24 04:21 UTC
Re: [PATCH] xfstests: btrfs/308: simple sparse copy testcase for btrfs
On 5/23/13 10:09 PM, Eryu Guan wrote:> On Thu, May 23, 2013 at 11:36:32AM -0500, Eric Sandeen wrote: >> From: Koen De Wit <koen.de.wit@oracle.com> >> >> # Tests file clone functionality of btrfs ("reflinks"): >> # - Reflink a file >> # - Reflink the reflinked file >> # - Modify the original file >> # - Modify the reflinked file >> >> [sandeen: add helpers, make several mostly-cosmetic >> changes to the original testcase] >> >> Signed-off-by: Koen De Wit <koen.de.wit@oracle.com> >> Signed-off-by: Eric Sandeen <sandeen@redhat.com> >> --- >> >> Originally submitted as test 297 >> >> diff --git a/common/rc b/common/rc >> index fe6bbfc..4560715 100644 >> --- a/common/rc >> +++ b/common/rc >> @@ -2098,6 +2098,27 @@ _require_dumpe2fs() >> fi >> } >> >> +_require_cp_reflink() >> +{ >> + cp --help | grep -q reflink || \ >> + _notrun "This test requires a cp with --reflink support." >> +} >> + >> +# Given 2 files, verify that they have the same mapping but different >> +# inodes - i.e. an undisturbed reflink >> +# Silent if so, make noise if not >> +_verify_reflink() >> +{ >> + # not a hard link or symlink? >> + cmp -s <(stat -c ''%i'' $1) <(stat -c ''%i'' $2) \ >> + && echo "$1 and $2 are not reflinks: same inode number" >> + >> + # same mapping? >> + diff -u <($XFS_IO_PROG -F -c "fiemap" $1 | grep -v $1) \ >> + <($XFS_IO_PROG -F -c "fiemap" $2 | grep -v $2) \ >> + || echo "$1 and $2 are not reflinks: different extents" > > I''m not sure if "-F" is still needed after commit > 96fce07 xfstests: automatically add -F to xfs_io on non-xfsRight, it''s not, oops. :( Old habits (and old patch, TBH) I can fix & resend all of them I guess. Thanks, -Eric _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
Eric Sandeen
2013-May-24 17:34 UTC
[PATCH V2] xfstests: btrfs/306: simple sparse copy testcase for btrfs
From: Koen De Wit <koen.de.wit@oracle.com>
# Tests file clone functionality of btrfs ("reflinks"):
# - Reflink a file
# - Reflink the reflinked file
# - Modify the original file
# - Modify the reflinked file
[sandeen: add helpers, make several mostly-cosmetic
changes to the original testcase]
Signed-off-by: Koen De Wit <koen.de.wit@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---
Originally submitted as test 297
V2: move to test 306, remove "-F" from $XFS_IO_PROG
diff --git a/common/rc b/common/rc
index fe6bbfc..4560715 100644
--- a/common/rc
+++ b/common/rc
@@ -2098,6 +2098,27 @@ _require_dumpe2fs()
fi
}
+_require_cp_reflink()
+{
+ cp --help | grep -q reflink || \
+ _notrun "This test requires a cp with --reflink support."
+}
+
+# Given 2 files, verify that they have the same mapping but different
+# inodes - i.e. an undisturbed reflink
+# Silent if so, make noise if not
+_verify_reflink()
+{
+ # not a hard link or symlink?
+ cmp -s <(stat -c ''%i'' $1) <(stat -c
''%i'' $2) \
+ && echo "$1 and $2 are not reflinks: same inode number"
+
+ # same mapping?
+ diff -u <($XFS_IO_PROG -c "fiemap" $1 | grep -v $1) \
+ <($XFS_IO_PROG -c "fiemap" $2 | grep -v $2) \
+ || echo "$1 and $2 are not reflinks: different extents"
+}
+
_create_loop_device()
{
file=$1
diff --git a/tests/btrfs/306 b/tests/btrfs/306
new file mode 100755
index 0000000..1bb8f02
--- /dev/null
+++ b/tests/btrfs/306
@@ -0,0 +1,87 @@
+#! /bin/bash
+# FS QA Test No. btrfs/306
+#
+# Tests file clone functionality of btrfs ("reflinks"):
+# - Reflink a file
+# - Reflink the reflinked file
+# - Modify the original file
+# - Modify the reflinked file
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013, Oracle and/or its affiliates. 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`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1 # failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. common/rc
+. common/filter
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+
+_require_xfs_io_fiemap
+_require_cp_reflink
+
+TESTDIR1=$TEST_DIR/test-$seq
+rm -rf $TESTDIR1
+mkdir $TESTDIR1
+
+_checksum_files() {
+ for F in original copy1 copy2
+ do
+ md5sum $TESTDIR1/$F | _filter_test_dir
+ done
+}
+
+rm -f $seqres.full
+
+echo "Create the original file and reflink to copy1, copy2"
+$XFS_IO_PROG -f -c ''pwrite -S 0x61 0 9000'' $TESTDIR1/original
>> $seqres.full 2>&1
+cp --reflink $TESTDIR1/original $TESTDIR1/copy1
+cp --reflink $TESTDIR1/copy1 $TESTDIR1/copy2
+_verify_reflink $TESTDIR1/original $TESTDIR1/copy1
+_verify_reflink $TESTDIR1/original $TESTDIR1/copy2
+echo "Original md5sums:"
+_checksum_files
+
+echo "Overwrite original file with new data"
+$XFS_IO_PROG -c ''pwrite -S 0x62 0 9000'' $TESTDIR1/original
>> $seqres.full 2>&1
+echo "md5sums after overwriting original:"
+_checksum_files
+
+echo "Overwrite copy1 with different new data"
+$XFS_IO_PROG -c ''pwrite -S 0x63 0 9000'' $TESTDIR1/copy1
>> $seqres.full 2>&1
+echo "md5sums after overwriting copy1:"
+_checksum_files
+
+# success, all done
+status=0
+exit
diff --git a/tests/btrfs/306.out b/tests/btrfs/306.out
new file mode 100644
index 0000000..7bccf08
--- /dev/null
+++ b/tests/btrfs/306.out
@@ -0,0 +1,16 @@
+QA output created by 306
+Create the original file and reflink to copy1, copy2
+Original md5sums:
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/original
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/copy2
+Overwrite original file with new data
+md5sums after overwriting original:
+4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-306/original
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/copy2
+Overwrite copy1 with different new data
+md5sums after overwriting copy1:
+4a847a25439532bf48b68c9e9536ed5b TEST_DIR/test-306/original
+e271cd47d9f62ebc96cb4e67ae4d16db TEST_DIR/test-306/copy1
+42d69d1a6d333a7ebdf64792a555e392 TEST_DIR/test-306/copy2
diff --git a/tests/btrfs/group b/tests/btrfs/group
index bc6c256..f24628c 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -9,3 +9,4 @@
276 auto rw metadata
284 auto
+306 auto quick reflink
307 auto quick
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html