[3/3] Btrfs-progs: add test for receive
diff mbox series

Message ID 20190114133146.18424-1-fdmanana@kernel.org
State New
Headers show
Series
  • [1/3] Btrfs-progs: fix mount point detection due to partial prefix match
Related show

Commit Message

Filipe Manana Jan. 14, 2019, 1:31 p.m. UTC
From: Filipe Manana <fdmanana@suse.com>

Add a test for a scenario that used to fail due to find_mount_root()
incorrectly determining the mount point for the receive path due to the
fact that a different mount point with a path that is a prefix of the
receive path exists.

This is fixed by a recent patch titled:

  "Btrfs-progs: fix mount point detection due to partial prefix match"

Reported-by: David Disseldorp <ddis@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 .../034-receive-common-mount-point-prefix/test.sh  | 47 ++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 tests/misc-tests/034-receive-common-mount-point-prefix/test.sh

Comments

David Disseldorp Jan. 14, 2019, 2:08 p.m. UTC | #1
On Mon, 14 Jan 2019 13:31:46 +0000, fdmanana@kernel.org wrote:

> From: Filipe Manana <fdmanana@suse.com>
> 
> Add a test for a scenario that used to fail due to find_mount_root()
> incorrectly determining the mount point for the receive path due to the
> fact that a different mount point with a path that is a prefix of the
> receive path exists.
> 
> This is fixed by a recent patch titled:
> 
>   "Btrfs-progs: fix mount point detection due to partial prefix match"
> 
> Reported-by: David Disseldorp <ddis@suse.com>

My address has an extra 's' (ddiss). This also applies to PATCH 1/3.

> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---
>  .../034-receive-common-mount-point-prefix/test.sh  | 47 ++++++++++++++++++++++
>  1 file changed, 47 insertions(+)
>  create mode 100755 tests/misc-tests/034-receive-common-mount-point-prefix/test.sh

Looks good.
Reviewed-by: David Disseldorp <ddiss@suse.de>
Filipe Manana Jan. 14, 2019, 2:11 p.m. UTC | #2
On Mon, Jan 14, 2019 at 2:08 PM David Disseldorp <ddiss@suse.de> wrote:
>
> On Mon, 14 Jan 2019 13:31:46 +0000, fdmanana@kernel.org wrote:
>
> > From: Filipe Manana <fdmanana@suse.com>
> >
> > Add a test for a scenario that used to fail due to find_mount_root()
> > incorrectly determining the mount point for the receive path due to the
> > fact that a different mount point with a path that is a prefix of the
> > receive path exists.
> >
> > This is fixed by a recent patch titled:
> >
> >   "Btrfs-progs: fix mount point detection due to partial prefix match"
> >
> > Reported-by: David Disseldorp <ddis@suse.com>
>
> My address has an extra 's' (ddiss). This also applies to PATCH 1/3.

Ops.
David can probably correct that when he picks the patch, otherwise
I'll send a new version.
Thanks.

>
> > Signed-off-by: Filipe Manana <fdmanana@suse.com>
> > ---
> >  .../034-receive-common-mount-point-prefix/test.sh  | 47 ++++++++++++++++++++++
> >  1 file changed, 47 insertions(+)
> >  create mode 100755 tests/misc-tests/034-receive-common-mount-point-prefix/test.sh
>
> Looks good.
> Reviewed-by: David Disseldorp <ddiss@suse.de>
David Sterba Jan. 15, 2019, 5:26 p.m. UTC | #3
On Mon, Jan 14, 2019 at 02:11:17PM +0000, Filipe Manana wrote:
> On Mon, Jan 14, 2019 at 2:08 PM David Disseldorp <ddiss@suse.de> wrote:
> >
> > On Mon, 14 Jan 2019 13:31:46 +0000, fdmanana@kernel.org wrote:
> >
> > > From: Filipe Manana <fdmanana@suse.com>
> > >
> > > Add a test for a scenario that used to fail due to find_mount_root()
> > > incorrectly determining the mount point for the receive path due to the
> > > fact that a different mount point with a path that is a prefix of the
> > > receive path exists.
> > >
> > > This is fixed by a recent patch titled:
> > >
> > >   "Btrfs-progs: fix mount point detection due to partial prefix match"
> > >
> > > Reported-by: David Disseldorp <ddis@suse.com>
> >
> > My address has an extra 's' (ddiss). This also applies to PATCH 1/3.
> 
> Ops.
> David can probably correct that when he picks the patch, otherwise

All fixed and applied, thanks.

Patch
diff mbox series

diff --git a/tests/misc-tests/034-receive-common-mount-point-prefix/test.sh b/tests/misc-tests/034-receive-common-mount-point-prefix/test.sh
new file mode 100755
index 00000000..e2a6fdfc
--- /dev/null
+++ b/tests/misc-tests/034-receive-common-mount-point-prefix/test.sh
@@ -0,0 +1,47 @@ 
+#!/bin/bash
+# Test that receive determines the correct mount point path when there is
+# another mount point that matches the destination's path as a prefix.
+
+source "$TEST_TOP/common"
+
+check_prereq btrfs
+check_prereq mkfs.btrfs
+
+setup_root_helper
+
+rm -f dev1 dev2
+run_check truncate -s 1G dev1
+run_check truncate -s 1G dev2
+chmod a+w dev1 dev2
+
+loop1=$(run_check_stdout $SUDO_HELPER losetup --find --show dev1)
+loop2=$(run_check_stdout $SUDO_HELPER losetup --find --show dev2)
+
+run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$loop1"
+run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$loop2"
+
+run_check $SUDO_HELPER mount "$loop1" "$TEST_MNT"
+mkdir "${TEST_MNT}/ddis"
+mkdir "${TEST_MNT}/ddis-not-a-mount"
+run_check $SUDO_HELPER mount "$loop2" "${TEST_MNT}/ddis"
+
+echo "some data" > "${TEST_MNT}/ddis/file"
+
+run_check $SUDO_HELPER "$TOP/btrfs" subvolume snapshot -r \
+	  "${TEST_MNT}/ddis" "${TEST_MNT}/ddis/snap"
+
+rm -f send.data
+run_check $SUDO_HELPER "$TOP/btrfs" send -f send.data "${TEST_MNT}/ddis/snap"
+
+# The following receive used to fail because it incorrectly determined the mount
+# point of the destination path to be ${TEST_MNT}/ddis and not $TEST_MNT.
+run_check $SUDO_HELPER "$TOP/btrfs" receive -f send.data \
+	  "${TEST_MNT}/ddis-not-a-mount"
+
+run_check $SUDO_HELPER umount "${TEST_MNT}/ddis"
+run_check $SUDO_HELPER umount "$TEST_MNT"
+
+# Cleanup loop devices and send data.
+run_check $SUDO_HELPER losetup -d "$loop1"
+run_check $SUDO_HELPER losetup -d "$loop2"
+rm -f dev1 dev2 send.data