* [PATCH] fstests: add btrfs test for fsync after snapshot deletion
@ 2016-03-24 17:07 fdmanana
2016-03-24 20:08 ` [PATCH v2] " fdmanana
2016-03-25 3:53 ` [PATCH] " Eryu Guan
0 siblings, 2 replies; 6+ messages in thread
From: fdmanana @ 2016-03-24 17:07 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Filipe Manana
From: Filipe Manana <fdmanana@suse.com>
Test that if we delete a snapshot, delete its parent directory, create
another directory with the same name as that parent and then fsync either
the new directory or a file inside the new directory, the fsync succeeds,
the fsync log is replayable and produces a correct result.
This is motivated by a bug that is fixed by the following patch for
btrfs (linux kernel):
Btrfs: fix unreplayable log after snapshot deletion and parent
re-creation
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
tests/btrfs/120 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/120.out | 12 +++++++
tests/btrfs/group | 1 +
3 files changed, 104 insertions(+)
create mode 100755 tests/btrfs/120
create mode 100644 tests/btrfs/120.out
diff --git a/tests/btrfs/120 b/tests/btrfs/120
new file mode 100755
index 0000000..4ede4e6
--- /dev/null
+++ b/tests/btrfs/120
@@ -0,0 +1,91 @@
+#! /bin/bash
+# FSQA Test No. 120
+#
+# Test that if we delete a snapshot, delete its parent directory, create
+# another directory with the same name as that parent and then fsync either
+# the new directory or a file inside the new directory, the fsync succeeds,
+# the fsync log is replayable and produces a correct result.
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Filipe Manana <fdmanana@suse.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()
+{
+ _cleanup_flakey
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/dmflakey
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_dm_target flakey
+_require_metadata_journaling $SCRATCH_DEV
+
+rm -f $seqres.full
+
+_populate_fs()
+{
+ _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \
+ $SCRATCH_MNT/testdir/snap
+ _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap
+ rmdir $SCRATCH_MNT/testdir
+ mkdir $SCRATCH_MNT/testdir
+}
+
+_scratch_mkfs >>$seqres.full 2>&1
+_init_flakey
+_mount_flakey
+
+mkdir $SCRATCH_MNT/testdir
+_populate_fs
+$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir
+_flakey_drop_and_remount
+
+echo "Filesystem contents after the first log replay:"
+ls -R $SCRATCH_MNT | _filter_scratch
+
+# Now do the same as before but instead of doing an fsync against the directory,
+# do an fsync against a file inside the directory.
+
+_populate_fs
+touch $SCRATCH_MNT/testdir/foobar
+$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir/foobar
+_flakey_drop_and_remount
+
+echo "Filesystem contents after the second log replay:"
+ls -R $SCRATCH_MNT | _filter_scratch
+
+_unmount_flakey
+status=0
+exit
diff --git a/tests/btrfs/120.out b/tests/btrfs/120.out
new file mode 100644
index 0000000..4210bfa
--- /dev/null
+++ b/tests/btrfs/120.out
@@ -0,0 +1,12 @@
+QA output created by 120
+Filesystem contents after the first log replay:
+SCRATCH_MNT:
+testdir
+
+SCRATCH_MNT/testdir:
+Filesystem contents after the second log replay:
+SCRATCH_MNT:
+testdir
+
+SCRATCH_MNT/testdir:
+foobar
diff --git a/tests/btrfs/group b/tests/btrfs/group
index d312874..13aa1e5 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -120,3 +120,4 @@
117 auto quick send clone
118 auto quick snapshot metadata
119 auto quick snapshot metadata qgroup
+120 auto quick snapshot metadata
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] fstests: add btrfs test for fsync after snapshot deletion
2016-03-24 17:07 [PATCH] fstests: add btrfs test for fsync after snapshot deletion fdmanana
@ 2016-03-24 20:08 ` fdmanana
2016-03-25 14:04 ` Eryu Guan
2016-03-25 3:53 ` [PATCH] " Eryu Guan
1 sibling, 1 reply; 6+ messages in thread
From: fdmanana @ 2016-03-24 20:08 UTC (permalink / raw)
To: fstests; +Cc: linux-btrfs, Filipe Manana
From: Filipe Manana <fdmanana@suse.com>
Test that if we delete a snapshot, delete its parent directory, create
another directory with the same name as that parent and then fsync either
the new directory or a file inside the new directory, the fsync succeeds,
the fsync log is replayable and produces a correct result.
This is motivated by a bug that is fixed by the following patch for
btrfs (linux kernel):
Btrfs: fix unreplayable log after snapshot deletion and parent
re-creation
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
V2: Renamed local function _populate_fs to populate_testdir.
tests/btrfs/120 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
tests/btrfs/120.out | 12 +++++++
tests/btrfs/group | 1 +
3 files changed, 104 insertions(+)
create mode 100755 tests/btrfs/120
create mode 100644 tests/btrfs/120.out
diff --git a/tests/btrfs/120 b/tests/btrfs/120
new file mode 100755
index 0000000..329b45c
--- /dev/null
+++ b/tests/btrfs/120
@@ -0,0 +1,91 @@
+#! /bin/bash
+# FSQA Test No. 120
+#
+# Test that if we delete a snapshot, delete its parent directory, create
+# another directory with the same name as that parent and then fsync either
+# the new directory or a file inside the new directory, the fsync succeeds,
+# the fsync log is replayable and produces a correct result.
+#
+#-----------------------------------------------------------------------
+#
+# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
+# Author: Filipe Manana <fdmanana@suse.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()
+{
+ _cleanup_flakey
+ cd /
+ rm -f $tmp.*
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+. ./common/dmflakey
+
+# real QA test starts here
+_supported_fs btrfs
+_supported_os Linux
+_require_scratch
+_require_dm_target flakey
+_require_metadata_journaling $SCRATCH_DEV
+
+rm -f $seqres.full
+
+populate_testdir()
+{
+ _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \
+ $SCRATCH_MNT/testdir/snap
+ _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap
+ rmdir $SCRATCH_MNT/testdir
+ mkdir $SCRATCH_MNT/testdir
+}
+
+_scratch_mkfs >>$seqres.full 2>&1
+_init_flakey
+_mount_flakey
+
+mkdir $SCRATCH_MNT/testdir
+populate_testdir
+$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir
+_flakey_drop_and_remount
+
+echo "Filesystem contents after the first log replay:"
+ls -R $SCRATCH_MNT | _filter_scratch
+
+# Now do the same as before but instead of doing an fsync against the directory,
+# do an fsync against a file inside the directory.
+
+populate_testdir
+touch $SCRATCH_MNT/testdir/foobar
+$XFS_IO_PROG -c "fsync" $SCRATCH_MNT/testdir/foobar
+_flakey_drop_and_remount
+
+echo "Filesystem contents after the second log replay:"
+ls -R $SCRATCH_MNT | _filter_scratch
+
+_unmount_flakey
+status=0
+exit
diff --git a/tests/btrfs/120.out b/tests/btrfs/120.out
new file mode 100644
index 0000000..4210bfa
--- /dev/null
+++ b/tests/btrfs/120.out
@@ -0,0 +1,12 @@
+QA output created by 120
+Filesystem contents after the first log replay:
+SCRATCH_MNT:
+testdir
+
+SCRATCH_MNT/testdir:
+Filesystem contents after the second log replay:
+SCRATCH_MNT:
+testdir
+
+SCRATCH_MNT/testdir:
+foobar
diff --git a/tests/btrfs/group b/tests/btrfs/group
index d312874..13aa1e5 100644
--- a/tests/btrfs/group
+++ b/tests/btrfs/group
@@ -120,3 +120,4 @@
117 auto quick send clone
118 auto quick snapshot metadata
119 auto quick snapshot metadata qgroup
+120 auto quick snapshot metadata
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] fstests: add btrfs test for fsync after snapshot deletion
2016-03-24 20:08 ` [PATCH v2] " fdmanana
@ 2016-03-25 14:04 ` Eryu Guan
0 siblings, 0 replies; 6+ messages in thread
From: Eryu Guan @ 2016-03-25 14:04 UTC (permalink / raw)
To: fdmanana; +Cc: fstests, linux-btrfs, Filipe Manana
On Thu, Mar 24, 2016 at 08:08:36PM +0000, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
>
> Test that if we delete a snapshot, delete its parent directory, create
> another directory with the same name as that parent and then fsync either
> the new directory or a file inside the new directory, the fsync succeeds,
> the fsync log is replayable and produces a correct result.
>
> This is motivated by a bug that is fixed by the following patch for
> btrfs (linux kernel):
>
> Btrfs: fix unreplayable log after snapshot deletion and parent
> re-creation
>
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
Looks good to me, test failed on v4.5 kernel and passed with above patch
(and dependencies) applied .
Reviewed-by: Eryu Guan <eguan@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fstests: add btrfs test for fsync after snapshot deletion
2016-03-24 17:07 [PATCH] fstests: add btrfs test for fsync after snapshot deletion fdmanana
2016-03-24 20:08 ` [PATCH v2] " fdmanana
@ 2016-03-25 3:53 ` Eryu Guan
2016-03-25 11:58 ` Holger Hoffstätte
1 sibling, 1 reply; 6+ messages in thread
From: Eryu Guan @ 2016-03-25 3:53 UTC (permalink / raw)
To: fdmanana; +Cc: fstests, linux-btrfs, Filipe Manana
On Thu, Mar 24, 2016 at 05:07:21PM +0000, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
>
> Test that if we delete a snapshot, delete its parent directory, create
> another directory with the same name as that parent and then fsync either
> the new directory or a file inside the new directory, the fsync succeeds,
> the fsync log is replayable and produces a correct result.
>
> This is motivated by a bug that is fixed by the following patch for
> btrfs (linux kernel):
>
> Btrfs: fix unreplayable log after snapshot deletion and parent
> re-creation
Test fails on v4.5 kernel as expected, but I failed to compile btrfs
after applying this patch, seems btrfs_must_commit_transaction was not
defined anywhere (I did grep it through the kernel tree, nothing showed
up), did I miss anything?
fs/btrfs/tree-log.c: In function ‘check_parent_dirs_for_sync’:
fs/btrfs/tree-log.c:4836:4: error: implicit declaration of function ‘btrfs_must_commit_transaction’ [-Werror=implicit-function-declaration]
if (btrfs_must_commit_transaction(trans, inode))
^
cc1: some warnings being treated as errors
make[1]: *** [fs/btrfs/tree-log.o] Error 1
make: *** [_module_fs/btrfs] Error 2
>
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---
> tests/btrfs/120 | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/btrfs/120.out | 12 +++++++
> tests/btrfs/group | 1 +
> 3 files changed, 104 insertions(+)
> create mode 100755 tests/btrfs/120
> create mode 100644 tests/btrfs/120.out
>
> diff --git a/tests/btrfs/120 b/tests/btrfs/120
> new file mode 100755
> index 0000000..4ede4e6
> --- /dev/null
> +++ b/tests/btrfs/120
> @@ -0,0 +1,91 @@
> +#! /bin/bash
> +# FSQA Test No. 120
> +#
> +# Test that if we delete a snapshot, delete its parent directory, create
> +# another directory with the same name as that parent and then fsync either
> +# the new directory or a file inside the new directory, the fsync succeeds,
> +# the fsync log is replayable and produces a correct result.
> +#
> +#-----------------------------------------------------------------------
> +#
> +# Copyright (C) 2016 SUSE Linux Products GmbH. All Rights Reserved.
> +# Author: Filipe Manana <fdmanana@suse.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()
> +{
> + _cleanup_flakey
> + cd /
> + rm -f $tmp.*
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +. ./common/dmflakey
> +
> +# real QA test starts here
> +_supported_fs btrfs
> +_supported_os Linux
> +_require_scratch
> +_require_dm_target flakey
> +_require_metadata_journaling $SCRATCH_DEV
> +
> +rm -f $seqres.full
> +
> +_populate_fs()
> +{
> + _run_btrfs_util_prog subvolume snapshot $SCRATCH_MNT \
> + $SCRATCH_MNT/testdir/snap
> + _run_btrfs_util_prog subvolume delete $SCRATCH_MNT/testdir/snap
> + rmdir $SCRATCH_MNT/testdir
> + mkdir $SCRATCH_MNT/testdir
> +}
There's already a _populate_fs function in common/rc, though this one
could override it, I think it's better to define a different function
name, e.g. without the leading underscore, as it's only used locally.
Thanks,
Eryu
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fstests: add btrfs test for fsync after snapshot deletion
2016-03-25 3:53 ` [PATCH] " Eryu Guan
@ 2016-03-25 11:58 ` Holger Hoffstätte
2016-03-25 14:00 ` Eryu Guan
0 siblings, 1 reply; 6+ messages in thread
From: Holger Hoffstätte @ 2016-03-25 11:58 UTC (permalink / raw)
To: Eryu Guan; +Cc: fstests, linux-btrfs, Filipe Manana
On 03/25/16 04:53, Eryu Guan wrote:
> Test fails on v4.5 kernel as expected, but I failed to compile btrfs
> after applying this patch, seems btrfs_must_commit_transaction was not
> defined anywhere (I did grep it through the kernel tree, nothing showed
> up), did I miss anything?
>
> fs/btrfs/tree-log.c: In function ‘check_parent_dirs_for_sync’:
> fs/btrfs/tree-log.c:4836:4: error: implicit declaration of function ‘btrfs_must_commit_transaction’ [-Werror=implicit-function-declaration]
> if (btrfs_must_commit_transaction(trans, inode))
> ^
> cc1: some warnings being treated as errors
> make[1]: *** [fs/btrfs/tree-log.o] Error 1
> make: *** [_module_fs/btrfs] Error 2
It was defined in a previous patch for 4.6:
https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git/commit/?h=for-linus-4.6&id=2be63d5ce929603d4e7cedabd9e992eb34a0ff95
-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] fstests: add btrfs test for fsync after snapshot deletion
2016-03-25 11:58 ` Holger Hoffstätte
@ 2016-03-25 14:00 ` Eryu Guan
0 siblings, 0 replies; 6+ messages in thread
From: Eryu Guan @ 2016-03-25 14:00 UTC (permalink / raw)
To: Holger Hoffstätte; +Cc: fstests, linux-btrfs, Filipe Manana
On Fri, Mar 25, 2016 at 12:58:52PM +0100, Holger Hoffstätte wrote:
> On 03/25/16 04:53, Eryu Guan wrote:
> > Test fails on v4.5 kernel as expected, but I failed to compile btrfs
> > after applying this patch, seems btrfs_must_commit_transaction was not
> > defined anywhere (I did grep it through the kernel tree, nothing showed
> > up), did I miss anything?
> >
> > fs/btrfs/tree-log.c: In function ‘check_parent_dirs_for_sync’:
> > fs/btrfs/tree-log.c:4836:4: error: implicit declaration of function ‘btrfs_must_commit_transaction’ [-Werror=implicit-function-declaration]
> > if (btrfs_must_commit_transaction(trans, inode))
> > ^
> > cc1: some warnings being treated as errors
> > make[1]: *** [fs/btrfs/tree-log.o] Error 1
> > make: *** [_module_fs/btrfs] Error 2
>
> It was defined in a previous patch for 4.6:
>
> https://git.kernel.org/cgit/linux/kernel/git/mason/linux-btrfs.git/commit/?h=for-linus-4.6&id=2be63d5ce929603d4e7cedabd9e992eb34a0ff95
I was testing against 4.5 kernel. Thanks for pointing it out, it
compiles now!
Thanks,
Eryu
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-25 14:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-24 17:07 [PATCH] fstests: add btrfs test for fsync after snapshot deletion fdmanana
2016-03-24 20:08 ` [PATCH v2] " fdmanana
2016-03-25 14:04 ` Eryu Guan
2016-03-25 3:53 ` [PATCH] " Eryu Guan
2016-03-25 11:58 ` Holger Hoffstätte
2016-03-25 14:00 ` Eryu Guan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).