Josef Bacik
2013-Aug-07 16:15 UTC
[PATCH] xfstests: add regression test for kernel bz 60673
There was a problem with send trying to overwrite a file that wasn''t
actually
the same. This is a test to check this particular case where receive fails when
it should succeed properly. I tested this to verify it fails without my fix and
passes with my fix. Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---
tests/btrfs/001 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/001.out | 2 +
tests/btrfs/group | 1 +
3 files changed, 113 insertions(+), 0 deletions(-)
create mode 100755 tests/btrfs/001
create mode 100644 tests/btrfs/001.out
diff --git a/tests/btrfs/001 b/tests/btrfs/001
new file mode 100755
index 0000000..453db95
--- /dev/null
+++ b/tests/btrfs/001
@@ -0,0 +1,110 @@
+#! /bin/bash
+# FS QA Test No. btrfs/001
+#
+# btrfs send ENOENT regression test, kernel bugzilla 60673
+#
+#-----------------------------------------------------------------------
+# Copyright (c) 2013 Fusion IO. 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/$$
+tmp_dir=send_temp_$seq
+
+status=1 # failure is the default!
+
+_cleanup()
+{
+ $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap1 > /dev/null
2>&1
+ $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/snap2 > /dev/null
2>&1
+ $BTRFS_UTIL_PROG subvol del $TEST_DIR/$tmp_dir/send > /dev/null 2>&1
+ rm -rf $TEST_DIR/$tmp_dir
+ rm -f $tmp.*
+}
+
+trap "_cleanup ; exit \$status" 0 1 2 3 15
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+
+_scratch_mkfs > /dev/null 2>&1
+
+#receive needs to be able to setxattrs, including the selinux context, if we
use
+#the normal nfs context thing it screws up our ability to set the
+#security.selinux xattrs so we need to disable this for this test
+export SELINUX_MOUNT_OPTIONS=""
+
+_scratch_mount
+
+mkdir $TEST_DIR/$tmp_dir
+$BTRFS_UTIL_PROG subvol create $TEST_DIR/$tmp_dir/send \
+ > $seqres.full 2>&1 || _fail "failed subvol create"
+
+cd $TEST_DIR/$tmp_dir/send
+
+mkdir test
+touch test/baz
+touch test/blah
+mkdir test/foo
+touch test/foo/bar
+
+# cd out in case any of this fails
+cd /
+
+$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \
+ $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail
"failed snap1"
+
+$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send1.dump \
+ $TEST_DIR/$tmp_dir/snap1 >> $seqres.full 2>&1 || _fail
"failed send"
+
+$BTRFS_UTIL_PROG receive -f $TEST_DIR/$tmp_dir/send1.dump $SCRATCH_MNT \
+ >> $seqres.full 2>&1 || _fail "failed receive"
+
+#recreate everything exactly the way it was exceptn in a different order so we
+#get different inode numbers
+cd $TEST_DIR/$tmp_dir/send
+rm -rf test
+mkdir test
+touch test/baz
+mkdir test/foo
+touch test/foo/bar
+touch test/blah
+cd /
+
+$BTRFS_UTIL_PROG subvol snap -r $TEST_DIR/$tmp_dir/send \
+ $TEST_DIR/$tmp_dir/snap2 >> $seqres.full 2>&1 || _fail
"failed snap2"
+
+$BTRFS_UTIL_PROG send -f $TEST_DIR/$tmp_dir/send2.dump \
+ $TEST_DIR/$tmp_dir/snap2 -p $TEST_DIR/$tmp_dir/snap1 \
+ >> $seqres.full 2>&1 || _fail "failed second send"
+
+$BTRFS_UTIL_PROG receive -f $TEST_DIR/$tmp_dir/send2.dump $SCRATCH_MNT \
+ >> $seqres.full 2>&1 || _fail "failed second receive"
+
+echo "Silence is golden"
+status=0 ; exit
diff --git a/tests/btrfs/001.out b/tests/btrfs/001.out
new file mode 100644
index 0000000..88678b8
--- /dev/null
+++ b/tests/btrfs/001.out
@@ -0,0 +1,2 @@
+QA output created by 001
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index c8fb502..3afa04f 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -3,6 +3,7 @@
# - do not start group names with a digit
# - comment line before each group is "new" description
#
+001 auto quick
254 auto quick
264 auto
265 auto
--
1.7.7.6
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
Rich Johnston
2013-Aug-14 20:27 UTC
Re: [PATCH] xfstests: add regression test for kernel bz 60673
On 08/07/2013 11:15 AM, Josef Bacik wrote:> There was a problem with send trying to overwrite a file that wasn''t actually > the same. This is a test to check this particular case where receive fails when > it should succeed properly. I tested this to verify it fails without my fix and > passes with my fix. Thanks, > > Signed-off-by: Josef Bacik <jbacik@fusionio.com> > --- > tests/btrfs/001 | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ > tests/btrfs/001.out | 2 + > tests/btrfs/group | 1 + > 3 files changed, 113 insertions(+), 0 deletions(-) > create mode 100755 tests/btrfs/001 > create mode 100644 tests/btrfs/001.out >Looks good but should have the btrfs folks look at this. Note: The btrfs test numbers have been renumbered please update your xfstests git tree for future patches and updates. Thanks --Rich _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs