[PATCH v3 0/4] Btrfs: add serval test case for incremental send

public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH v3 0/4] Btrfs: add serval test case for incremental send
@ 2017-01-04 10:53 robbieko
  2017-01-04 10:53 ` [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision robbieko
                   ` (3 more replies)
  0 siblings, 4 replies; 12+ messages in thread
From: robbieko @ 2017-01-04 10:53 UTC (permalink / raw)
  To: fstests; +Cc: linux-btrfs, Robbie Ko

From: Robbie Ko <robbieko@synology.com>

Patch for test btrfs incremental send.

V3: remove "run_" based helpers
V2: improve the change log

Robbie Ko (4):
  xfstests: btrfs/131: add test for an incremental send with name
    collision
  xfstests: btrfs/132: add test for invaild update time by an
    incremental send
  xfstests: btrfs/133: add test for incremental send with rmdir applied
    on wrong name
  xfstests: btrfs/134: add test for incremental send which renames a
    directory already being deleted

 tests/btrfs/131     | 115 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/131.out |   9 ++++
 tests/btrfs/132     | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/132.out |   7 +++
 tests/btrfs/133     | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/133.out |   9 ++++
 tests/btrfs/134     | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/134.out |   9 ++++
 tests/btrfs/group   |   4 ++
 9 files changed, 523 insertions(+)
 create mode 100755 tests/btrfs/131
 create mode 100644 tests/btrfs/131.out
 create mode 100755 tests/btrfs/132
 create mode 100644 tests/btrfs/132.out
 create mode 100755 tests/btrfs/133
 create mode 100644 tests/btrfs/133.out
 create mode 100755 tests/btrfs/134
 create mode 100644 tests/btrfs/134.out

-- 
1.9.1


^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision
  2017-01-04 10:53 [PATCH v3 0/4] Btrfs: add serval test case for incremental send robbieko
@ 2017-01-04 10:53 ` robbieko
  2017-01-04 10:53 ` [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send robbieko
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 12+ messages in thread
From: robbieko @ 2017-01-04 10:53 UTC (permalink / raw)
  To: fstests; +Cc: linux-btrfs, Robbie Ko

From: Robbie Ko <robbieko@synology.com>

Test that an incremental send operation doesn't work because
there's a name collision in the destination and it's not checked
corretly before the rename operation applies.

This test exercises scenarios used to fail in btrfs and are fixed by
the following patch for the linux kernel:

"Btrfs: incremental send, do not skip generation inconsistency check for inode 256."

Signed-off-by: Robbie Ko <robbieko@synology.com>
---
V3: remove "run_" based helpers
V2: improve the change log

 tests/btrfs/131     | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/131.out |   9 ++++
 tests/btrfs/group   |   1 +
 3 files changed, 125 insertions(+)
 create mode 100755 tests/btrfs/131
 create mode 100644 tests/btrfs/131.out

diff --git a/tests/btrfs/131 b/tests/btrfs/131
new file mode 100755
index 0000000..ed01662
--- /dev/null
+++ b/tests/btrfs/131
@@ -0,0 +1,115 @@
+#! /bin/bash
+# FS QA Test No. btrfs/131
+#
+# Test that an incremental send operation doesn't work because
+# there's a name collision in the destination and it's not checked
+# corretly before the rename operation applies.
+#
+#-----------------------------------------------------------------------
+# Copyright (C) 2016 Synology Inc. All Rights Reserved.
+# Author: Robbie Ko <robbieko@synology.com>
+#
+# 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"
+
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -fr $send_files_dir
+	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_test
+_require_scratch
+_require_fssum
+
+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
+
+mkdir $SCRATCH_MNT/a1
+mkdir $SCRATCH_MNT/a2
+
+# Filesystem looks like:
+#
+# .                                                             (ino 256)
+# |--- a1/                                                      (ino 257)
+# |
+# |--- a2/                                                      (ino 258)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap1 > /dev/null
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+touch $SCRATCH_MNT/a2
+
+# Filesystem now looks like:
+#
+# .                                                             (ino 256)
+# |--- a2                                                       (ino 257)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap2 > /dev/null
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+rm $send_files_dir/1.snap
+
+$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
+	-f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
+
+# Now recreate the filesystem by receiving both send streams and verify we get
+# the same content that the original filesystem had.
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/131.out b/tests/btrfs/131.out
new file mode 100644
index 0000000..3bea480
--- /dev/null
+++ b/tests/btrfs/131.out
@@ -0,0 +1,9 @@
+QA output created by 131
+At subvol SCRATCH_MNT/mysnap1
+At subvol mysnap1
+At subvol SCRATCH_MNT/mysnap1
+At subvol SCRATCH_MNT/mysnap2
+At subvol mysnap1
+OK
+OK
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index f3a7a4f..a7a070a 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -133,3 +133,4 @@
 128 auto quick send
 129 auto quick send
 130 auto clone send
+131 auto quick send
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send
  2017-01-04 10:53 [PATCH v3 0/4] Btrfs: add serval test case for incremental send robbieko
  2017-01-04 10:53 ` [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision robbieko
@ 2017-01-04 10:53 ` robbieko
  2017-01-04 13:09   ` Filipe Manana
  2017-01-04 10:53 ` [PATCH v3 3/4] xfstests: btrfs/133: add test for incremental send with rmdir applied on wrong name robbieko
  2017-01-04 10:53 ` [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted robbieko
  3 siblings, 1 reply; 12+ messages in thread
From: robbieko @ 2017-01-04 10:53 UTC (permalink / raw)
  To: fstests; +Cc: linux-btrfs, Robbie Ko

From: Robbie Ko <robbieko@synology.com>

Test that an incremental send operation dosen't' work because
it tries to update the time to a deleted directory after it finishes
a move operation.

The other one is that an operation is applied to a file using the old
name not the new name.

This test exercises scenarios used to fail in btrfs and are fixed by
the following patches for the linux kernel:

"Btrfs: incremental send, add generation check for the inode waiting for rmdir operation."
"Btrfs: incremental send, add generation check in existence demtermination for the parent directory"

Signed-off-by: Robbie Ko <robbieko@synology.com>
---
V3: remove "run_" based helpers
V2: improve the change log

 tests/btrfs/132     | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/132.out |   7 +++
 tests/btrfs/group   |   1 +
 3 files changed, 131 insertions(+)
 create mode 100755 tests/btrfs/132
 create mode 100644 tests/btrfs/132.out

diff --git a/tests/btrfs/132 b/tests/btrfs/132
new file mode 100755
index 0000000..f1bb698
--- /dev/null
+++ b/tests/btrfs/132
@@ -0,0 +1,123 @@
+#! /bin/bash
+# FS QA Test No. btrfs/132
+#
+# Test that an incremental send operation dosen't' work because
+# it tries to update the time to a deleted directory after it finishes
+# a move operation.
+# 
+# The other one is that an operation is applied to a file using the old
+# name not the new name.
+#
+#-----------------------------------------------------------------------
+# Copyright (C) 2016 Synology Inc. All Rights Reserved.
+# Author: Robbie Ko <robbieko@synology.com>
+#
+# 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"
+
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -fr $send_files_dir
+	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_test
+_require_scratch
+_require_fssum
+
+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
+
+mkdir $SCRATCH_MNT/dir257
+mkdir $SCRATCH_MNT/dir258
+mkdir $SCRATCH_MNT/dir259
+mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257
+
+# Filesystem looks like:
+#
+# .                                                             (ino 256)
+# |--- dir258/                                                  (ino 258)
+# |    |--- dir257/                                             (ino 257)
+# |
+# |--- dir259/                                                  (ino 259)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap1 > /dev/null
+
+mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257
+rmdir $SCRATCH_MNT/dir258
+rmdir $SCRATCH_MNT/dir259
+_scratch_unmount
+_scratch_mount
+touch $SCRATCH_MNT/file258
+mkdir $SCRATCH_MNT/new_dir259
+mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257
+
+# Filesystem now looks like:
+#
+# .                                                             (ino 256)
+# |--- file258                                                  (ino 258)
+# |
+# |--- new_dir259/                                              (ino 259)
+# |    |--- dir257/                                             (ino 257)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap2 > /dev/null
+
+$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$FSSUM_PROG -A -f -w $send_files_dir/2.fssum \
+        -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
+	-f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
+
+# Now recreate the filesystem by receiving both send streams and verify we get
+# the same content that the original filesystem had.
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/132.out b/tests/btrfs/132.out
new file mode 100644
index 0000000..ff21547
--- /dev/null
+++ b/tests/btrfs/132.out
@@ -0,0 +1,7 @@
+QA output created by 132
+At subvol SCRATCH_MNT/mysnap1
+At subvol SCRATCH_MNT/mysnap2
+At subvol mysnap1
+OK
+OK
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index a7a070a..1b12382 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -134,3 +134,4 @@
 129 auto quick send
 130 auto clone send
 131 auto quick send
+132 auto quick send
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send
  2017-01-04 10:53 ` [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send robbieko
@ 2017-01-04 13:09   ` Filipe Manana
  2017-01-05  2:45     ` robbieko
  0 siblings, 1 reply; 12+ messages in thread
From: Filipe Manana @ 2017-01-04 13:09 UTC (permalink / raw)
  To: robbieko; +Cc: fstests, linux-btrfs@vger.kernel.org

On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> wrote:
> From: Robbie Ko <robbieko@synology.com>
>
> Test that an incremental send operation dosen't' work because
> it tries to update the time to a deleted directory after it finishes
> a move operation.
>
> The other one is that an operation is applied to a file using the old
> name not the new name.
>
> This test exercises scenarios used to fail in btrfs and are fixed by
> the following patches for the linux kernel:
>
> "Btrfs: incremental send, add generation check for the inode waiting for rmdir operation."
> "Btrfs: incremental send, add generation check in existence demtermination for the parent directory"
>
> Signed-off-by: Robbie Ko <robbieko@synology.com>
> ---
> V3: remove "run_" based helpers
> V2: improve the change log
>
>  tests/btrfs/132     | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/btrfs/132.out |   7 +++
>  tests/btrfs/group   |   1 +
>  3 files changed, 131 insertions(+)
>  create mode 100755 tests/btrfs/132
>  create mode 100644 tests/btrfs/132.out
>
> diff --git a/tests/btrfs/132 b/tests/btrfs/132
> new file mode 100755
> index 0000000..f1bb698
> --- /dev/null
> +++ b/tests/btrfs/132
> @@ -0,0 +1,123 @@
> +#! /bin/bash
> +# FS QA Test No. btrfs/132
> +#
> +# Test that an incremental send operation dosen't' work because
> +# it tries to update the time to a deleted directory after it finishes
> +# a move operation.
> +#
> +# The other one is that an operation is applied to a file using the old
> +# name not the new name.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
> +# Author: Robbie Ko <robbieko@synology.com>
> +#
> +# 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"
> +
> +tmp=/tmp/$$
> +status=1       # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +       cd /
> +       rm -fr $send_files_dir
> +       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_test
> +_require_scratch
> +_require_fssum
> +
> +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
> +
> +mkdir $SCRATCH_MNT/dir257
> +mkdir $SCRATCH_MNT/dir258
> +mkdir $SCRATCH_MNT/dir259
> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257
> +
> +# Filesystem looks like:
> +#
> +# .                                                             (ino 256)
> +# |--- dir258/                                                  (ino 258)
> +# |    |--- dir257/                                             (ino 257)
> +# |
> +# |--- dir259/                                                  (ino 259)
> +#
> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
> +    $SCRATCH_MNT/mysnap1 > /dev/null
> +
> +mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257
> +rmdir $SCRATCH_MNT/dir258
> +rmdir $SCRATCH_MNT/dir259
> +_scratch_unmount
> +_scratch_mount

Why do need to remount the fs? There's also a _scratch_remount function.

Again, I would like to see comments in the test explaining why and
how/why did the incremental send operation used to fail (like most of
the existing send/receive tests have).

thanks

> +touch $SCRATCH_MNT/file258
> +mkdir $SCRATCH_MNT/new_dir259
> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257
> +
> +# Filesystem now looks like:
> +#
> +# .                                                             (ino 256)
> +# |--- file258                                                  (ino 258)
> +# |
> +# |--- new_dir259/                                              (ino 259)
> +# |    |--- dir257/                                             (ino 257)
> +#
> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
> +    $SCRATCH_MNT/mysnap2 > /dev/null
> +
> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum \
> +        -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2
> +
> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
> +
> +# Now recreate the filesystem by receiving both send streams and verify we get
> +# the same content that the original filesystem had.
> +_scratch_unmount
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount
> +
> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
> +
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/btrfs/132.out b/tests/btrfs/132.out
> new file mode 100644
> index 0000000..ff21547
> --- /dev/null
> +++ b/tests/btrfs/132.out
> @@ -0,0 +1,7 @@
> +QA output created by 132
> +At subvol SCRATCH_MNT/mysnap1
> +At subvol SCRATCH_MNT/mysnap2
> +At subvol mysnap1
> +OK
> +OK
> +Silence is golden
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index a7a070a..1b12382 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -134,3 +134,4 @@
>  129 auto quick send
>  130 auto clone send
>  131 auto quick send
> +132 auto quick send
> --
> 1.9.1
>
> --
> 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



-- 
Filipe David Manana,

"People will forget what you said,
 people will forget what you did,
 but people will never forget how you made them feel."

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send
  2017-01-04 13:09   ` Filipe Manana
@ 2017-01-05  2:45     ` robbieko
  2017-01-05 11:31       ` Filipe Manana
  0 siblings, 1 reply; 12+ messages in thread
From: robbieko @ 2017-01-05  2:45 UTC (permalink / raw)
  To: fdmanana; +Cc: fstests, linux-btrfs

Filipe Manana 於 2017-01-04 21:09 寫到:
> On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> 
> wrote:
>> From: Robbie Ko <robbieko@synology.com>
>> 
>> Test that an incremental send operation dosen't' work because
>> it tries to update the time to a deleted directory after it finishes
>> a move operation.
>> 
>> The other one is that an operation is applied to a file using the old
>> name not the new name.
>> 
>> This test exercises scenarios used to fail in btrfs and are fixed by
>> the following patches for the linux kernel:
>> 
>> "Btrfs: incremental send, add generation check for the inode waiting 
>> for rmdir operation."
>> "Btrfs: incremental send, add generation check in existence 
>> demtermination for the parent directory"
>> 
>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>> ---
>> V3: remove "run_" based helpers
>> V2: improve the change log
>> 
>>  tests/btrfs/132     | 123 
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  tests/btrfs/132.out |   7 +++
>>  tests/btrfs/group   |   1 +
>>  3 files changed, 131 insertions(+)
>>  create mode 100755 tests/btrfs/132
>>  create mode 100644 tests/btrfs/132.out
>> 
>> diff --git a/tests/btrfs/132 b/tests/btrfs/132
>> new file mode 100755
>> index 0000000..f1bb698
>> --- /dev/null
>> +++ b/tests/btrfs/132
>> @@ -0,0 +1,123 @@
>> +#! /bin/bash
>> +# FS QA Test No. btrfs/132
>> +#
>> +# Test that an incremental send operation dosen't' work because
>> +# it tries to update the time to a deleted directory after it 
>> finishes
>> +# a move operation.
>> +#
>> +# The other one is that an operation is applied to a file using the 
>> old
>> +# name not the new name.
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
>> +# Author: Robbie Ko <robbieko@synology.com>
>> +#
>> +# 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"
>> +
>> +tmp=/tmp/$$
>> +status=1       # failure is the default!
>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>> +
>> +_cleanup()
>> +{
>> +       cd /
>> +       rm -fr $send_files_dir
>> +       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_test
>> +_require_scratch
>> +_require_fssum
>> +
>> +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
>> +
>> +mkdir $SCRATCH_MNT/dir257
>> +mkdir $SCRATCH_MNT/dir258
>> +mkdir $SCRATCH_MNT/dir259
>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257
>> +
>> +# Filesystem looks like:
>> +#
>> +# .                                                             (ino 
>> 256)
>> +# |--- dir258/                                                  (ino 
>> 258)
>> +# |    |--- dir257/                                             (ino 
>> 257)
>> +# |
>> +# |--- dir259/                                                  (ino 
>> 259)
>> +#
>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>> +    $SCRATCH_MNT/mysnap1 > /dev/null
>> +
>> +mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257
>> +rmdir $SCRATCH_MNT/dir258
>> +rmdir $SCRATCH_MNT/dir259
>> +_scratch_unmount
>> +_scratch_mount
> 
> Why do need to remount the fs? There's also a _scratch_remount 
> function.
> 
> Again, I would like to see comments in the test explaining why and
> how/why did the incremental send operation used to fail (like most of
> the existing send/receive tests have).
> 
> thanks

Because we need to use the same inode 258 recreate, so need to delete 
the
old dir258 and dir259, then remount the fs, the next new file will be 
generated
from inode 258.

thanks

> 
>> +touch $SCRATCH_MNT/file258
>> +mkdir $SCRATCH_MNT/new_dir259
>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257
>> +
>> +# Filesystem now looks like:
>> +#
>> +# .                                                             (ino 
>> 256)
>> +# |--- file258                                                  (ino 
>> 258)
>> +# |
>> +# |--- new_dir259/                                              (ino 
>> 259)
>> +# |    |--- dir257/                                             (ino 
>> 257)
>> +#
>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>> +    $SCRATCH_MNT/mysnap2 > /dev/null
>> +
>> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum \
>> +        -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2
>> +
>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
>> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
>> +
>> +# Now recreate the filesystem by receiving both send streams and 
>> verify we get
>> +# the same content that the original filesystem had.
>> +_scratch_unmount
>> +_scratch_mkfs >>$seqres.full 2>&1
>> +_scratch_mount
>> +
>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > 
>> /dev/null
>> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > 
>> /dev/null
>> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>> +
>> +echo "Silence is golden"
>> +status=0
>> +exit
>> diff --git a/tests/btrfs/132.out b/tests/btrfs/132.out
>> new file mode 100644
>> index 0000000..ff21547
>> --- /dev/null
>> +++ b/tests/btrfs/132.out
>> @@ -0,0 +1,7 @@
>> +QA output created by 132
>> +At subvol SCRATCH_MNT/mysnap1
>> +At subvol SCRATCH_MNT/mysnap2
>> +At subvol mysnap1
>> +OK
>> +OK
>> +Silence is golden
>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>> index a7a070a..1b12382 100644
>> --- a/tests/btrfs/group
>> +++ b/tests/btrfs/group
>> @@ -134,3 +134,4 @@
>>  129 auto quick send
>>  130 auto clone send
>>  131 auto quick send
>> +132 auto quick send
>> --
>> 1.9.1
>> 
>> --
>> 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send
  2017-01-05  2:45     ` robbieko
@ 2017-01-05 11:31       ` Filipe Manana
  2017-01-19 12:10         ` Filipe Manana
  0 siblings, 1 reply; 12+ messages in thread
From: Filipe Manana @ 2017-01-05 11:31 UTC (permalink / raw)
  To: robbieko; +Cc: fstests, linux-btrfs@vger.kernel.org

On Thu, Jan 5, 2017 at 2:45 AM, robbieko <robbieko@synology.com> wrote:
> Filipe Manana 於 2017-01-04 21:09 寫到:
>
>> On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> wrote:
>>>
>>> From: Robbie Ko <robbieko@synology.com>
>>>
>>> Test that an incremental send operation dosen't' work because
>>> it tries to update the time to a deleted directory after it finishes
>>> a move operation.
>>>
>>> The other one is that an operation is applied to a file using the old
>>> name not the new name.
>>>
>>> This test exercises scenarios used to fail in btrfs and are fixed by
>>> the following patches for the linux kernel:
>>>
>>> "Btrfs: incremental send, add generation check for the inode waiting for
>>> rmdir operation."
>>> "Btrfs: incremental send, add generation check in existence
>>> demtermination for the parent directory"
>>>
>>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>>> ---
>>> V3: remove "run_" based helpers
>>> V2: improve the change log
>>>
>>>  tests/btrfs/132     | 123
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>  tests/btrfs/132.out |   7 +++
>>>  tests/btrfs/group   |   1 +
>>>  3 files changed, 131 insertions(+)
>>>  create mode 100755 tests/btrfs/132
>>>  create mode 100644 tests/btrfs/132.out
>>>
>>> diff --git a/tests/btrfs/132 b/tests/btrfs/132
>>> new file mode 100755
>>> index 0000000..f1bb698
>>> --- /dev/null
>>> +++ b/tests/btrfs/132
>>> @@ -0,0 +1,123 @@
>>> +#! /bin/bash
>>> +# FS QA Test No. btrfs/132
>>> +#
>>> +# Test that an incremental send operation dosen't' work because
>>> +# it tries to update the time to a deleted directory after it finishes
>>> +# a move operation.
>>> +#
>>> +# The other one is that an operation is applied to a file using the old
>>> +# name not the new name.
>>> +#
>>> +#-----------------------------------------------------------------------
>>> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
>>> +# Author: Robbie Ko <robbieko@synology.com>
>>> +#
>>> +# 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"
>>> +
>>> +tmp=/tmp/$$
>>> +status=1       # failure is the default!
>>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>>> +
>>> +_cleanup()
>>> +{
>>> +       cd /
>>> +       rm -fr $send_files_dir
>>> +       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_test
>>> +_require_scratch
>>> +_require_fssum
>>> +
>>> +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
>>> +
>>> +mkdir $SCRATCH_MNT/dir257
>>> +mkdir $SCRATCH_MNT/dir258
>>> +mkdir $SCRATCH_MNT/dir259
>>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257
>>> +
>>> +# Filesystem looks like:
>>> +#
>>> +# .                                                             (ino
>>> 256)
>>> +# |--- dir258/                                                  (ino
>>> 258)
>>> +# |    |--- dir257/                                             (ino
>>> 257)
>>> +# |
>>> +# |--- dir259/                                                  (ino
>>> 259)
>>> +#
>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>> +    $SCRATCH_MNT/mysnap1 > /dev/null
>>> +
>>> +mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257
>>> +rmdir $SCRATCH_MNT/dir258
>>> +rmdir $SCRATCH_MNT/dir259
>>> +_scratch_unmount
>>> +_scratch_mount
>>
>>
>> Why do need to remount the fs? There's also a _scratch_remount function.
>>
>> Again, I would like to see comments in the test explaining why and
>> how/why did the incremental send operation used to fail (like most of
>> the existing send/receive tests have).
>>
>> thanks
>
>
> Because we need to use the same inode 258 recreate, so need to delete the
> old dir258 and dir259, then remount the fs, the next new file will be
> generated
> from inode 258.

So you want to recreate the same inodes, with the same numbers but
different generation values. You can get the same effect by using the
mount option "-o inode_cache" (which is more obvious and doesn't rely
on an implementation detail that is not guaranteed to exist forever).
Again, as I said in my reply to some other test, this should be well
explained as a comment in the test.

thanks

>
>
> thanks
>
>>
>>> +touch $SCRATCH_MNT/file258
>>> +mkdir $SCRATCH_MNT/new_dir259
>>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257
>>> +
>>> +# Filesystem now looks like:
>>> +#
>>> +# .                                                             (ino
>>> 256)
>>> +# |--- file258                                                  (ino
>>> 258)
>>> +# |
>>> +# |--- new_dir259/                                              (ino
>>> 259)
>>> +# |    |--- dir257/                                             (ino
>>> 257)
>>> +#
>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>> +    $SCRATCH_MNT/mysnap2 > /dev/null
>>> +
>>> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum \
>>> +        -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2
>>> +
>>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>>> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
>>> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
>>> +
>>> +# Now recreate the filesystem by receiving both send streams and verify
>>> we get
>>> +# the same content that the original filesystem had.
>>> +_scratch_unmount
>>> +_scratch_mkfs >>$seqres.full 2>&1
>>> +_scratch_mount
>>> +
>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap >
>>> /dev/null
>>> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap >
>>> /dev/null
>>> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>>> +
>>> +echo "Silence is golden"
>>> +status=0
>>> +exit
>>> diff --git a/tests/btrfs/132.out b/tests/btrfs/132.out
>>> new file mode 100644
>>> index 0000000..ff21547
>>> --- /dev/null
>>> +++ b/tests/btrfs/132.out
>>> @@ -0,0 +1,7 @@
>>> +QA output created by 132
>>> +At subvol SCRATCH_MNT/mysnap1
>>> +At subvol SCRATCH_MNT/mysnap2
>>> +At subvol mysnap1
>>> +OK
>>> +OK
>>> +Silence is golden
>>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>>> index a7a070a..1b12382 100644
>>> --- a/tests/btrfs/group
>>> +++ b/tests/btrfs/group
>>> @@ -134,3 +134,4 @@
>>>  129 auto quick send
>>>  130 auto clone send
>>>  131 auto quick send
>>> +132 auto quick send
>>> --
>>> 1.9.1
>>>
>>> --
>>> 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



-- 
Filipe David Manana,

"People will forget what you said,
 people will forget what you did,
 but people will never forget how you made them feel."

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send
  2017-01-05 11:31       ` Filipe Manana
@ 2017-01-19 12:10         ` Filipe Manana
  0 siblings, 0 replies; 12+ messages in thread
From: Filipe Manana @ 2017-01-19 12:10 UTC (permalink / raw)
  To: robbieko; +Cc: fstests, linux-btrfs@vger.kernel.org

On Thu, Jan 5, 2017 at 11:31 AM, Filipe Manana <fdmanana@gmail.com> wrote:
> On Thu, Jan 5, 2017 at 2:45 AM, robbieko <robbieko@synology.com> wrote:
>> Filipe Manana 於 2017-01-04 21:09 寫到:
>>
>>> On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> wrote:
>>>>
>>>> From: Robbie Ko <robbieko@synology.com>
>>>>
>>>> Test that an incremental send operation dosen't' work because
>>>> it tries to update the time to a deleted directory after it finishes
>>>> a move operation.
>>>>
>>>> The other one is that an operation is applied to a file using the old
>>>> name not the new name.
>>>>
>>>> This test exercises scenarios used to fail in btrfs and are fixed by
>>>> the following patches for the linux kernel:
>>>>
>>>> "Btrfs: incremental send, add generation check for the inode waiting for
>>>> rmdir operation."
>>>> "Btrfs: incremental send, add generation check in existence
>>>> demtermination for the parent directory"
>>>>
>>>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>>>> ---
>>>> V3: remove "run_" based helpers
>>>> V2: improve the change log
>>>>
>>>>  tests/btrfs/132     | 123
>>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>>  tests/btrfs/132.out |   7 +++
>>>>  tests/btrfs/group   |   1 +
>>>>  3 files changed, 131 insertions(+)
>>>>  create mode 100755 tests/btrfs/132
>>>>  create mode 100644 tests/btrfs/132.out
>>>>
>>>> diff --git a/tests/btrfs/132 b/tests/btrfs/132
>>>> new file mode 100755
>>>> index 0000000..f1bb698
>>>> --- /dev/null
>>>> +++ b/tests/btrfs/132
>>>> @@ -0,0 +1,123 @@
>>>> +#! /bin/bash
>>>> +# FS QA Test No. btrfs/132
>>>> +#
>>>> +# Test that an incremental send operation dosen't' work because
>>>> +# it tries to update the time to a deleted directory after it finishes
>>>> +# a move operation.
>>>> +#
>>>> +# The other one is that an operation is applied to a file using the old
>>>> +# name not the new name.
>>>> +#
>>>> +#-----------------------------------------------------------------------
>>>> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
>>>> +# Author: Robbie Ko <robbieko@synology.com>
>>>> +#
>>>> +# 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"
>>>> +
>>>> +tmp=/tmp/$$
>>>> +status=1       # failure is the default!
>>>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>>>> +
>>>> +_cleanup()
>>>> +{
>>>> +       cd /
>>>> +       rm -fr $send_files_dir
>>>> +       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_test
>>>> +_require_scratch
>>>> +_require_fssum
>>>> +
>>>> +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
>>>> +
>>>> +mkdir $SCRATCH_MNT/dir257
>>>> +mkdir $SCRATCH_MNT/dir258
>>>> +mkdir $SCRATCH_MNT/dir259
>>>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/dir258/dir257
>>>> +
>>>> +# Filesystem looks like:
>>>> +#
>>>> +# .                                                             (ino
>>>> 256)
>>>> +# |--- dir258/                                                  (ino
>>>> 258)
>>>> +# |    |--- dir257/                                             (ino
>>>> 257)
>>>> +# |
>>>> +# |--- dir259/                                                  (ino
>>>> 259)
>>>> +#
>>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>>> +    $SCRATCH_MNT/mysnap1 > /dev/null
>>>> +
>>>> +mv $SCRATCH_MNT/dir258/dir257 $SCRATCH_MNT/dir257
>>>> +rmdir $SCRATCH_MNT/dir258
>>>> +rmdir $SCRATCH_MNT/dir259
>>>> +_scratch_unmount
>>>> +_scratch_mount
>>>
>>>
>>> Why do need to remount the fs? There's also a _scratch_remount function.
>>>
>>> Again, I would like to see comments in the test explaining why and
>>> how/why did the incremental send operation used to fail (like most of
>>> the existing send/receive tests have).
>>>
>>> thanks
>>
>>
>> Because we need to use the same inode 258 recreate, so need to delete the
>> old dir258 and dir259, then remount the fs, the next new file will be
>> generated
>> from inode 258.
>
> So you want to recreate the same inodes, with the same numbers but
> different generation values. You can get the same effect by using the
> mount option "-o inode_cache" (which is more obvious and doesn't rely
> on an implementation detail that is not guaranteed to exist forever).
> Again, as I said in my reply to some other test, this should be well
> explained as a comment in the test.

Nevermind. I have made the changes myself and sent a new version of
this test and the others, preserving your authorship.

In the future, please also take the care to update the change log to
mention the subject of the last versions of the kernel patches.
Right now these change logs refers to the subjects of older versions
of the kernel patches... Not really helpful.

thanks

>
> thanks
>
>>
>>
>> thanks
>>
>>>
>>>> +touch $SCRATCH_MNT/file258
>>>> +mkdir $SCRATCH_MNT/new_dir259
>>>> +mv $SCRATCH_MNT/dir257 $SCRATCH_MNT/new_dir259/dir257
>>>> +
>>>> +# Filesystem now looks like:
>>>> +#
>>>> +# .                                                             (ino
>>>> 256)
>>>> +# |--- file258                                                  (ino
>>>> 258)
>>>> +# |
>>>> +# |--- new_dir259/                                              (ino
>>>> 259)
>>>> +# |    |--- dir257/                                             (ino
>>>> 257)
>>>> +#
>>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>>> +    $SCRATCH_MNT/mysnap2 > /dev/null
>>>> +
>>>> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>>> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum \
>>>> +        -x $SCRATCH_MNT/mysnap2/mysnap1 $SCRATCH_MNT/mysnap2
>>>> +
>>>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>>>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>>>> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
>>>> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
>>>> +
>>>> +# Now recreate the filesystem by receiving both send streams and verify
>>>> we get
>>>> +# the same content that the original filesystem had.
>>>> +_scratch_unmount
>>>> +_scratch_mkfs >>$seqres.full 2>&1
>>>> +_scratch_mount
>>>> +
>>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap >
>>>> /dev/null
>>>> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap >
>>>> /dev/null
>>>> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>>>> +
>>>> +echo "Silence is golden"
>>>> +status=0
>>>> +exit
>>>> diff --git a/tests/btrfs/132.out b/tests/btrfs/132.out
>>>> new file mode 100644
>>>> index 0000000..ff21547
>>>> --- /dev/null
>>>> +++ b/tests/btrfs/132.out
>>>> @@ -0,0 +1,7 @@
>>>> +QA output created by 132
>>>> +At subvol SCRATCH_MNT/mysnap1
>>>> +At subvol SCRATCH_MNT/mysnap2
>>>> +At subvol mysnap1
>>>> +OK
>>>> +OK
>>>> +Silence is golden
>>>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>>>> index a7a070a..1b12382 100644
>>>> --- a/tests/btrfs/group
>>>> +++ b/tests/btrfs/group
>>>> @@ -134,3 +134,4 @@
>>>>  129 auto quick send
>>>>  130 auto clone send
>>>>  131 auto quick send
>>>> +132 auto quick send
>>>> --
>>>> 1.9.1
>>>>
>>>> --
>>>> 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
>
>
>
> --
> Filipe David Manana,
>
> "People will forget what you said,
>  people will forget what you did,
>  but people will never forget how you made them feel."



-- 
Filipe David Manana,

"People will forget what you said,
 people will forget what you did,
 but people will never forget how you made them feel."

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v3 3/4] xfstests: btrfs/133: add test for incremental send with rmdir applied on wrong name
  2017-01-04 10:53 [PATCH v3 0/4] Btrfs: add serval test case for incremental send robbieko
  2017-01-04 10:53 ` [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision robbieko
  2017-01-04 10:53 ` [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send robbieko
@ 2017-01-04 10:53 ` robbieko
  2017-01-04 10:53 ` [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted robbieko
  3 siblings, 0 replies; 12+ messages in thread
From: robbieko @ 2017-01-04 10:53 UTC (permalink / raw)
  To: fstests; +Cc: linux-btrfs, Robbie Ko

From: Robbie Ko <robbieko@synology.com>

Test that an incremental send operation doesn't work for rmdir
because it uses the wrong name to delete.

This test exercises scenarios used to fail in btrfs and are fixed by
the following patch for the linux kernel:

"Btrfs: incremental send, skip check overwritten if parents' generation are different"

Signed-off-by: Robbie Ko <robbieko@synology.com>
---
V3: remove "run_" based helpers
V2: improve the change log

 tests/btrfs/133     | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/133.out |   9 ++++
 tests/btrfs/group   |   1 +
 3 files changed, 133 insertions(+)
 create mode 100755 tests/btrfs/133
 create mode 100644 tests/btrfs/133.out

diff --git a/tests/btrfs/133 b/tests/btrfs/133
new file mode 100755
index 0000000..a7375c9
--- /dev/null
+++ b/tests/btrfs/133
@@ -0,0 +1,123 @@
+#! /bin/bash
+# FS QA Test No. btrfs/133
+#
+# Test that an incremental send operation doesn't work for rmdir
+# because it uses the wrong name to delete.
+#
+#-----------------------------------------------------------------------
+# Copyright (C) 2016 Synology Inc. All Rights Reserved.
+# Author: Robbie Ko <robbieko@synology.com>
+#
+# 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"
+
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -fr $send_files_dir
+	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_test
+_require_scratch
+_require_fssum
+
+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
+
+touch $SCRATCH_MNT/f
+mkdir $SCRATCH_MNT/d1
+mkdir $SCRATCH_MNT/d259_old
+mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d259_old/d1
+
+# Filesystem looks like:
+#
+# .                                                             (ino 256)
+# |--- f                                                        (ino 257)
+# |
+# |--- d259_old/                                                (ino 259)
+# |    |--- d1/                                                 (ino 258)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap1 > /dev/null
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+mkdir $SCRATCH_MNT/d1
+mkdir $SCRATCH_MNT/dir258
+mkdir $SCRATCH_MNT/dir259
+mv $SCRATCH_MNT/d1 $SCRATCH_MNT/dir259/d1
+
+# Filesystem now looks like:
+#
+# .                                                             (ino 256)
+# |--- dir258                                                   (ino 258)
+# |
+# |--- dir259/                                                  (ino 259)
+# |    |--- d1/                                                 (ino 257)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap2 > /dev/null
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+rm $send_files_dir/1.snap
+
+$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
+	-f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
+
+# Now recreate the filesystem by receiving both send streams and verify we get
+# the same content that the original filesystem had.
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/133.out b/tests/btrfs/133.out
new file mode 100644
index 0000000..ae53750
--- /dev/null
+++ b/tests/btrfs/133.out
@@ -0,0 +1,9 @@
+QA output created by 133
+At subvol SCRATCH_MNT/mysnap1
+At subvol mysnap1
+At subvol SCRATCH_MNT/mysnap1
+At subvol SCRATCH_MNT/mysnap2
+At subvol mysnap1
+OK
+OK
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 1b12382..779caec 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -135,3 +135,4 @@
 130 auto clone send
 131 auto quick send
 132 auto quick send
+133 auto quick send
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted
  2017-01-04 10:53 [PATCH v3 0/4] Btrfs: add serval test case for incremental send robbieko
                   ` (2 preceding siblings ...)
  2017-01-04 10:53 ` [PATCH v3 3/4] xfstests: btrfs/133: add test for incremental send with rmdir applied on wrong name robbieko
@ 2017-01-04 10:53 ` robbieko
  2017-01-04 13:07   ` Filipe Manana
  3 siblings, 1 reply; 12+ messages in thread
From: robbieko @ 2017-01-04 10:53 UTC (permalink / raw)
  To: fstests; +Cc: linux-btrfs, Robbie Ko

From: Robbie Ko <robbieko@synology.com>

Test that an incremental send operation dosen't work because
it tries to rename a directory which is already deleted.

This test exercises scenarios used to fail in btrfs and are fixed by
the following patch for the linux kernel:

"Btrfs: incremental send, add generation check for inode is waiting for move."

Signed-off-by: Robbie Ko <robbieko@synology.com>
---
V3: remove "run_" based helpers
V2: improve the change log

 tests/btrfs/134     | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/btrfs/134.out |   9 ++++
 tests/btrfs/group   |   1 +
 3 files changed, 134 insertions(+)
 create mode 100755 tests/btrfs/134
 create mode 100644 tests/btrfs/134.out

diff --git a/tests/btrfs/134 b/tests/btrfs/134
new file mode 100755
index 0000000..87c108e
--- /dev/null
+++ b/tests/btrfs/134
@@ -0,0 +1,124 @@
+#! /bin/bash
+# FS QA Test No. btrfs/134
+#
+# Test that an incremental send operation dosen't work because
+# it tries to rename a directory which is already deleted.
+#
+#-----------------------------------------------------------------------
+# Copyright (C) 2016 Synology Inc. All Rights Reserved.
+# Author: Robbie Ko <robbieko@synology.com>
+#
+# 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"
+
+tmp=/tmp/$$
+status=1	# failure is the default!
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
+_cleanup()
+{
+	cd /
+	rm -fr $send_files_dir
+	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_test
+_require_scratch
+_require_fssum
+
+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
+
+mkdir $SCRATCH_MNT/d1
+mkdir $SCRATCH_MNT/d4
+mkdir $SCRATCH_MNT/d3
+
+# Filesystem looks like:
+#
+# .                                                             (ino 256)
+# |--- d1                                                       (ino 257)
+# |--- d4                                                       (ino 258)
+# |--- d3                                                       (ino 259)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap1 > /dev/null
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+mkdir $SCRATCH_MNT/d1
+mkdir $SCRATCH_MNT/d2
+mkdir $SCRATCH_MNT/d3
+mkdir $SCRATCH_MNT/d4
+mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d3/d1
+mv $SCRATCH_MNT/d3 $SCRATCH_MNT/d4/d3
+mv $SCRATCH_MNT/d2 $SCRATCH_MNT/d1
+
+# Filesystem now looks like:
+#
+# .                                                             (ino 256)
+# |--- d1                                                       (ino 258)
+# |--- d4                                                       (ino 260)
+# |    |--- d3/                                                 (ino 259)
+# |    |    |--- d1/                                            (ino 257)
+#
+$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
+    $SCRATCH_MNT/mysnap2 > /dev/null
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+rm $send_files_dir/1.snap
+
+$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
+    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
+$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
+	-f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
+
+# Now recreate the filesystem by receiving both send streams and verify we get
+# the same content that the original filesystem had.
+_scratch_unmount
+_scratch_mkfs >>$seqres.full 2>&1
+_scratch_mount
+
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
+$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
+$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
+
+echo "Silence is golden"
+status=0
+exit
diff --git a/tests/btrfs/134.out b/tests/btrfs/134.out
new file mode 100644
index 0000000..700a78f
--- /dev/null
+++ b/tests/btrfs/134.out
@@ -0,0 +1,9 @@
+QA output created by 134
+At subvol SCRATCH_MNT/mysnap1
+At subvol mysnap1
+At subvol SCRATCH_MNT/mysnap1
+At subvol SCRATCH_MNT/mysnap2
+At subvol mysnap1
+OK
+OK
+Silence is golden
diff --git a/tests/btrfs/group b/tests/btrfs/group
index 779caec..831283e 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -136,3 +136,4 @@
 131 auto quick send
 132 auto quick send
 133 auto quick send
+134 auto quick send
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted
  2017-01-04 10:53 ` [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted robbieko
@ 2017-01-04 13:07   ` Filipe Manana
  2017-01-05  5:22     ` robbieko
  0 siblings, 1 reply; 12+ messages in thread
From: Filipe Manana @ 2017-01-04 13:07 UTC (permalink / raw)
  To: robbieko; +Cc: fstests, linux-btrfs@vger.kernel.org

On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> wrote:
> From: Robbie Ko <robbieko@synology.com>
>
> Test that an incremental send operation dosen't work because

dosen't -> doesn't

> it tries to rename a directory which is already deleted.
>
> This test exercises scenarios used to fail in btrfs and are fixed by
> the following patch for the linux kernel:
>
> "Btrfs: incremental send, add generation check for inode is waiting for move."
>
> Signed-off-by: Robbie Ko <robbieko@synology.com>
> ---
> V3: remove "run_" based helpers
> V2: improve the change log
>
>  tests/btrfs/134     | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  tests/btrfs/134.out |   9 ++++
>  tests/btrfs/group   |   1 +
>  3 files changed, 134 insertions(+)
>  create mode 100755 tests/btrfs/134
>  create mode 100644 tests/btrfs/134.out
>
> diff --git a/tests/btrfs/134 b/tests/btrfs/134
> new file mode 100755
> index 0000000..87c108e
> --- /dev/null
> +++ b/tests/btrfs/134
> @@ -0,0 +1,124 @@
> +#! /bin/bash
> +# FS QA Test No. btrfs/134
> +#
> +# Test that an incremental send operation dosen't work because

dosen't -> doesn't

> +# it tries to rename a directory which is already deleted.
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.

We're already in 2017 btw.

> +# Author: Robbie Ko <robbieko@synology.com>
> +#
> +# 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"
> +
> +tmp=/tmp/$$
> +status=1       # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> +       cd /
> +       rm -fr $send_files_dir
> +       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_test
> +_require_scratch
> +_require_fssum
> +
> +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
> +
> +mkdir $SCRATCH_MNT/d1
> +mkdir $SCRATCH_MNT/d4
> +mkdir $SCRATCH_MNT/d3
> +
> +# Filesystem looks like:
> +#
> +# .                                                             (ino 256)
> +# |--- d1                                                       (ino 257)
> +# |--- d4                                                       (ino 258)
> +# |--- d3                                                       (ino 259)
> +#
> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
> +    $SCRATCH_MNT/mysnap1 > /dev/null
> +
> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
> +
> +_scratch_unmount
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount

I don't understand this. Why do we need to recreate the filesystem?
Why don't we just create the first and second snapshots in the same
filesystems, just like all the other tests do.

I would like to see comments explaining why that is needed and how/why
the incremental send used to fail (in a user understandable way, not
in a very technical way referring to pieces of code of btrfs), just
like most of the existing send/receive tests have.

I haven't tried nor reviewed the btrfs patches, but I hope to do it this week.

thanks

> +mkdir $SCRATCH_MNT/d1
> +mkdir $SCRATCH_MNT/d2
> +mkdir $SCRATCH_MNT/d3
> +mkdir $SCRATCH_MNT/d4
> +mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d3/d1
> +mv $SCRATCH_MNT/d3 $SCRATCH_MNT/d4/d3
> +mv $SCRATCH_MNT/d2 $SCRATCH_MNT/d1
> +
> +# Filesystem now looks like:
> +#
> +# .                                                             (ino 256)
> +# |--- d1                                                       (ino 258)
> +# |--- d4                                                       (ino 260)
> +# |    |--- d3/                                                 (ino 259)
> +# |    |    |--- d1/                                            (ino 257)
> +#
> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
> +    $SCRATCH_MNT/mysnap2 > /dev/null
> +
> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
> +rm $send_files_dir/1.snap
> +
> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
> +
> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
> +
> +# Now recreate the filesystem by receiving both send streams and verify we get
> +# the same content that the original filesystem had.
> +_scratch_unmount
> +_scratch_mkfs >>$seqres.full 2>&1
> +_scratch_mount
> +
> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > /dev/null
> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > /dev/null
> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
> +
> +echo "Silence is golden"
> +status=0
> +exit
> diff --git a/tests/btrfs/134.out b/tests/btrfs/134.out
> new file mode 100644
> index 0000000..700a78f
> --- /dev/null
> +++ b/tests/btrfs/134.out
> @@ -0,0 +1,9 @@
> +QA output created by 134
> +At subvol SCRATCH_MNT/mysnap1
> +At subvol mysnap1
> +At subvol SCRATCH_MNT/mysnap1
> +At subvol SCRATCH_MNT/mysnap2
> +At subvol mysnap1
> +OK
> +OK
> +Silence is golden
> diff --git a/tests/btrfs/group b/tests/btrfs/group
> index 779caec..831283e 100644
> --- a/tests/btrfs/group
> +++ b/tests/btrfs/group
> @@ -136,3 +136,4 @@
>  131 auto quick send
>  132 auto quick send
>  133 auto quick send
> +134 auto quick send
> --
> 1.9.1
>
> --
> 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



-- 
Filipe David Manana,

"People will forget what you said,
 people will forget what you did,
 but people will never forget how you made them feel."

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted
  2017-01-04 13:07   ` Filipe Manana
@ 2017-01-05  5:22     ` robbieko
  2017-01-05 11:28       ` Filipe Manana
  0 siblings, 1 reply; 12+ messages in thread
From: robbieko @ 2017-01-05  5:22 UTC (permalink / raw)
  To: fdmanana; +Cc: fstests, linux-btrfs

Filipe Manana 於 2017-01-04 21:07 寫到:
> On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> 
> wrote:
>> From: Robbie Ko <robbieko@synology.com>
>> 
>> Test that an incremental send operation dosen't work because
> 
> dosen't -> doesn't
> 
>> it tries to rename a directory which is already deleted.
>> 
>> This test exercises scenarios used to fail in btrfs and are fixed by
>> the following patch for the linux kernel:
>> 
>> "Btrfs: incremental send, add generation check for inode is waiting 
>> for move."
>> 
>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>> ---
>> V3: remove "run_" based helpers
>> V2: improve the change log
>> 
>>  tests/btrfs/134     | 124 
>> ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  tests/btrfs/134.out |   9 ++++
>>  tests/btrfs/group   |   1 +
>>  3 files changed, 134 insertions(+)
>>  create mode 100755 tests/btrfs/134
>>  create mode 100644 tests/btrfs/134.out
>> 
>> diff --git a/tests/btrfs/134 b/tests/btrfs/134
>> new file mode 100755
>> index 0000000..87c108e
>> --- /dev/null
>> +++ b/tests/btrfs/134
>> @@ -0,0 +1,124 @@
>> +#! /bin/bash
>> +# FS QA Test No. btrfs/134
>> +#
>> +# Test that an incremental send operation dosen't work because
> 
> dosen't -> doesn't
> 
>> +# it tries to rename a directory which is already deleted.
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
> 
> We're already in 2017 btw.
> 
>> +# Author: Robbie Ko <robbieko@synology.com>
>> +#
>> +# 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"
>> +
>> +tmp=/tmp/$$
>> +status=1       # failure is the default!
>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>> +
>> +_cleanup()
>> +{
>> +       cd /
>> +       rm -fr $send_files_dir
>> +       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_test
>> +_require_scratch
>> +_require_fssum
>> +
>> +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
>> +
>> +mkdir $SCRATCH_MNT/d1
>> +mkdir $SCRATCH_MNT/d4
>> +mkdir $SCRATCH_MNT/d3
>> +
>> +# Filesystem looks like:
>> +#
>> +# .                                                             (ino 
>> 256)
>> +# |--- d1                                                       (ino 
>> 257)
>> +# |--- d4                                                       (ino 
>> 258)
>> +# |--- d3                                                       (ino 
>> 259)
>> +#
>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>> +    $SCRATCH_MNT/mysnap1 > /dev/null
>> +
>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>> +
>> +_scratch_unmount
>> +_scratch_mkfs >>$seqres.full 2>&1
>> +_scratch_mount
> 
> I don't understand this. Why do we need to recreate the filesystem?
> Why don't we just create the first and second snapshots in the same
> filesystems, just like all the other tests do.
> 
> I would like to see comments explaining why that is needed and how/why
> the incremental send used to fail (in a user understandable way, not
> in a very technical way referring to pieces of code of btrfs), just
> like most of the existing send/receive tests have.
> 
> I haven't tried nor reviewed the btrfs patches, but I hope to do it 
> this week.
> 
> thanks

Does not require recreate the filesystem, it just a scenario,
there are many ways to do the same thing,
we just need to use the same inode number, but different from the old 
one.
Let btrfs send need to recreate dir.

The primary mistake is "ERROR: rename d1 -> o257-44-0 failed: No such 
file or directory"
But in fact the old d1 has been deleted.

thanks.

>> +mkdir $SCRATCH_MNT/d1
>> +mkdir $SCRATCH_MNT/d2
>> +mkdir $SCRATCH_MNT/d3
>> +mkdir $SCRATCH_MNT/d4
>> +mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d3/d1
>> +mv $SCRATCH_MNT/d3 $SCRATCH_MNT/d4/d3
>> +mv $SCRATCH_MNT/d2 $SCRATCH_MNT/d1
>> +
>> +# Filesystem now looks like:
>> +#
>> +# .                                                             (ino 
>> 256)
>> +# |--- d1                                                       (ino 
>> 258)
>> +# |--- d4                                                       (ino 
>> 260)
>> +# |    |--- d3/                                                 (ino 
>> 259)
>> +# |    |    |--- d1/                                            (ino 
>> 257)
>> +#
>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>> +    $SCRATCH_MNT/mysnap2 > /dev/null
>> +
>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > 
>> /dev/null
>> +rm $send_files_dir/1.snap
>> +
>> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>> +
>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
>> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
>> +
>> +# Now recreate the filesystem by receiving both send streams and 
>> verify we get
>> +# the same content that the original filesystem had.
>> +_scratch_unmount
>> +_scratch_mkfs >>$seqres.full 2>&1
>> +_scratch_mount
>> +
>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap > 
>> /dev/null
>> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap > 
>> /dev/null
>> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>> +
>> +echo "Silence is golden"
>> +status=0
>> +exit
>> diff --git a/tests/btrfs/134.out b/tests/btrfs/134.out
>> new file mode 100644
>> index 0000000..700a78f
>> --- /dev/null
>> +++ b/tests/btrfs/134.out
>> @@ -0,0 +1,9 @@
>> +QA output created by 134
>> +At subvol SCRATCH_MNT/mysnap1
>> +At subvol mysnap1
>> +At subvol SCRATCH_MNT/mysnap1
>> +At subvol SCRATCH_MNT/mysnap2
>> +At subvol mysnap1
>> +OK
>> +OK
>> +Silence is golden
>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>> index 779caec..831283e 100644
>> --- a/tests/btrfs/group
>> +++ b/tests/btrfs/group
>> @@ -136,3 +136,4 @@
>>  131 auto quick send
>>  132 auto quick send
>>  133 auto quick send
>> +134 auto quick send
>> --
>> 1.9.1
>> 
>> --
>> 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

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted
  2017-01-05  5:22     ` robbieko
@ 2017-01-05 11:28       ` Filipe Manana
  0 siblings, 0 replies; 12+ messages in thread
From: Filipe Manana @ 2017-01-05 11:28 UTC (permalink / raw)
  To: robbieko; +Cc: fstests, linux-btrfs@vger.kernel.org

On Thu, Jan 5, 2017 at 5:22 AM, robbieko <robbieko@synology.com> wrote:
> Filipe Manana 於 2017-01-04 21:07 寫到:
>
>> On Wed, Jan 4, 2017 at 10:53 AM, robbieko <robbieko@synology.com> wrote:
>>>
>>> From: Robbie Ko <robbieko@synology.com>
>>>
>>> Test that an incremental send operation dosen't work because
>>
>>
>> dosen't -> doesn't
>>
>>> it tries to rename a directory which is already deleted.
>>>
>>> This test exercises scenarios used to fail in btrfs and are fixed by
>>> the following patch for the linux kernel:
>>>
>>> "Btrfs: incremental send, add generation check for inode is waiting for
>>> move."
>>>
>>> Signed-off-by: Robbie Ko <robbieko@synology.com>
>>> ---
>>> V3: remove "run_" based helpers
>>> V2: improve the change log
>>>
>>>  tests/btrfs/134     | 124
>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>  tests/btrfs/134.out |   9 ++++
>>>  tests/btrfs/group   |   1 +
>>>  3 files changed, 134 insertions(+)
>>>  create mode 100755 tests/btrfs/134
>>>  create mode 100644 tests/btrfs/134.out
>>>
>>> diff --git a/tests/btrfs/134 b/tests/btrfs/134
>>> new file mode 100755
>>> index 0000000..87c108e
>>> --- /dev/null
>>> +++ b/tests/btrfs/134
>>> @@ -0,0 +1,124 @@
>>> +#! /bin/bash
>>> +# FS QA Test No. btrfs/134
>>> +#
>>> +# Test that an incremental send operation dosen't work because
>>
>>
>> dosen't -> doesn't
>>
>>> +# it tries to rename a directory which is already deleted.
>>> +#
>>> +#-----------------------------------------------------------------------
>>> +# Copyright (C) 2016 Synology Inc. All Rights Reserved.
>>
>>
>> We're already in 2017 btw.
>>
>>> +# Author: Robbie Ko <robbieko@synology.com>
>>> +#
>>> +# 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"
>>> +
>>> +tmp=/tmp/$$
>>> +status=1       # failure is the default!
>>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>>> +
>>> +_cleanup()
>>> +{
>>> +       cd /
>>> +       rm -fr $send_files_dir
>>> +       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_test
>>> +_require_scratch
>>> +_require_fssum
>>> +
>>> +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
>>> +
>>> +mkdir $SCRATCH_MNT/d1
>>> +mkdir $SCRATCH_MNT/d4
>>> +mkdir $SCRATCH_MNT/d3
>>> +
>>> +# Filesystem looks like:
>>> +#
>>> +# .                                                             (ino
>>> 256)
>>> +# |--- d1                                                       (ino
>>> 257)
>>> +# |--- d4                                                       (ino
>>> 258)
>>> +# |--- d3                                                       (ino
>>> 259)
>>> +#
>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>> +    $SCRATCH_MNT/mysnap1 > /dev/null
>>> +
>>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>>> +
>>> +_scratch_unmount
>>> +_scratch_mkfs >>$seqres.full 2>&1
>>> +_scratch_mount
>>
>>
>> I don't understand this. Why do we need to recreate the filesystem?
>> Why don't we just create the first and second snapshots in the same
>> filesystems, just like all the other tests do.
>>
>> I would like to see comments explaining why that is needed and how/why
>> the incremental send used to fail (in a user understandable way, not
>> in a very technical way referring to pieces of code of btrfs), just
>> like most of the existing send/receive tests have.
>>
>> I haven't tried nor reviewed the btrfs patches, but I hope to do it this
>> week.
>>
>> thanks
>
>
> Does not require recreate the filesystem, it just a scenario,
> there are many ways to do the same thing,

If there are many ways, then use the simpler one which doesn't raise
any questions and anyone can understand it.
If a non-obvious scenario is needed then just add a comment explaining why.

> we just need to use the same inode number, but different from the old one.

What you want to say is creating the same inode (same number) but with
a different generation, is that it?

And I would like to see this explanations as comments in the code.
Whenever in the future someone reads the test, he/she is unlikely to
go search the mailing list thread for explanations.

> Let btrfs send need to recreate dir.
>
> The primary mistake is "ERROR: rename d1 -> o257-44-0 failed: No such file
> or directory"
> But in fact the old d1 has been deleted.

Again, explain it in the test as a comment that send used to issue a
rename operation with a no longer valid source name (and why that
happened).
Look at the existing send/receive tests that have explanations of the
problems they test, for example:
https://git.kernel.org/cgit/fs/xfs/xfstests-dev.git/tree/tests/btrfs/129#n81

thanks


>
> thanks.
>
>
>>> +mkdir $SCRATCH_MNT/d1
>>> +mkdir $SCRATCH_MNT/d2
>>> +mkdir $SCRATCH_MNT/d3
>>> +mkdir $SCRATCH_MNT/d4
>>> +mv $SCRATCH_MNT/d1 $SCRATCH_MNT/d3/d1
>>> +mv $SCRATCH_MNT/d3 $SCRATCH_MNT/d4/d3
>>> +mv $SCRATCH_MNT/d2 $SCRATCH_MNT/d1
>>> +
>>> +# Filesystem now looks like:
>>> +#
>>> +# .                                                             (ino
>>> 256)
>>> +# |--- d1                                                       (ino
>>> 258)
>>> +# |--- d4                                                       (ino
>>> 260)
>>> +# |    |--- d3/                                                 (ino
>>> 259)
>>> +# |    |    |--- d1/                                            (ino
>>> 257)
>>> +#
>>> +$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT \
>>> +    $SCRATCH_MNT/mysnap2 > /dev/null
>>> +
>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap >
>>> /dev/null
>>> +rm $send_files_dir/1.snap
>>> +
>>> +$FSSUM_PROG -A -f -w $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>> +$FSSUM_PROG -A -f -w $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>>> +
>>> +$BTRFS_UTIL_PROG send $SCRATCH_MNT/mysnap1 -f \
>>> +    $send_files_dir/1.snap 2>&1 1>/dev/null | _filter_scratch
>>> +$BTRFS_UTIL_PROG send -p $SCRATCH_MNT/mysnap1 $SCRATCH_MNT/mysnap2 \
>>> +       -f $send_files_dir/2.snap 2>&1 1>/dev/null | _filter_scratch
>>> +
>>> +# Now recreate the filesystem by receiving both send streams and verify
>>> we get
>>> +# the same content that the original filesystem had.
>>> +_scratch_unmount
>>> +_scratch_mkfs >>$seqres.full 2>&1
>>> +_scratch_mount
>>> +
>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/1.snap >
>>> /dev/null
>>> +$FSSUM_PROG -r $send_files_dir/1.fssum $SCRATCH_MNT/mysnap1
>>> +$BTRFS_UTIL_PROG receive $SCRATCH_MNT -f $send_files_dir/2.snap >
>>> /dev/null
>>> +$FSSUM_PROG -r $send_files_dir/2.fssum $SCRATCH_MNT/mysnap2
>>> +
>>> +echo "Silence is golden"
>>> +status=0
>>> +exit
>>> diff --git a/tests/btrfs/134.out b/tests/btrfs/134.out
>>> new file mode 100644
>>> index 0000000..700a78f
>>> --- /dev/null
>>> +++ b/tests/btrfs/134.out
>>> @@ -0,0 +1,9 @@
>>> +QA output created by 134
>>> +At subvol SCRATCH_MNT/mysnap1
>>> +At subvol mysnap1
>>> +At subvol SCRATCH_MNT/mysnap1
>>> +At subvol SCRATCH_MNT/mysnap2
>>> +At subvol mysnap1
>>> +OK
>>> +OK
>>> +Silence is golden
>>> diff --git a/tests/btrfs/group b/tests/btrfs/group
>>> index 779caec..831283e 100644
>>> --- a/tests/btrfs/group
>>> +++ b/tests/btrfs/group
>>> @@ -136,3 +136,4 @@
>>>  131 auto quick send
>>>  132 auto quick send
>>>  133 auto quick send
>>> +134 auto quick send
>>> --
>>> 1.9.1
>>>
>>> --
>>> 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



-- 
Filipe David Manana,

"People will forget what you said,
 people will forget what you did,
 but people will never forget how you made them feel."

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-01-19 12:18 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-04 10:53 [PATCH v3 0/4] Btrfs: add serval test case for incremental send robbieko
2017-01-04 10:53 ` [PATCH v3 1/4] xfstests: btrfs/131: add test for an incremental send with name collision robbieko
2017-01-04 10:53 ` [PATCH v3 2/4] xfstests: btrfs/132: add test for invaild update time by an incremental send robbieko
2017-01-04 13:09   ` Filipe Manana
2017-01-05  2:45     ` robbieko
2017-01-05 11:31       ` Filipe Manana
2017-01-19 12:10         ` Filipe Manana
2017-01-04 10:53 ` [PATCH v3 3/4] xfstests: btrfs/133: add test for incremental send with rmdir applied on wrong name robbieko
2017-01-04 10:53 ` [PATCH v3 4/4] xfstests: btrfs/134: add test for incremental send which renames a directory already being deleted robbieko
2017-01-04 13:07   ` Filipe Manana
2017-01-05  5:22     ` robbieko
2017-01-05 11:28       ` Filipe Manana

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox