Btrfs-progs: add test for receive
PATCH 3/3 Btrfs-progs: add test for receive
From: Filipe Manana <[email protected]>
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"
--- .../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
tests/misc-tests/034-receive-common-mount-point-prefix/test.sh new file +47 -0
@@ -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
Signature · 1 line
2.11.0
Quoted 7 lines · On Mon, 14 Jan 2019 13:31:46 +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
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.
Quoted 5 lines
This is fixed by a recent patch titled:
"Btrfs-progs: fix mount point detection due to partial prefix match"
Reported-by David Disseldorp <[email protected]>
My address has an extra 's' (ddiss). This also applies to PATCH 1/3.
Quoted 5 lines
Signed-off-by Filipe Manana <[email protected]>--- .../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.
Quoted 10 lines · David Disseldorp
Quoted 7 lines · On Mon, 14 Jan 2019 13:31:46 +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
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.
Quoted 7 lines
Quoted 5 lines
This is fixed by a recent patch titled:
"Btrfs-progs: fix mount point detection due to partial prefix match"
Reported-by David Disseldorp <[email protected]>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.
Quoted 9 lines
Quoted 6 lines
Signed-off-by Filipe Manana <[email protected]>--- .../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.shLooks good.
Reviewed-by David Disseldorp <[email protected]>
Quoted 13 lines · Filipe Manana
Quoted 12 lines · David Disseldorp
Quoted 9 lines · On Mon, 14 Jan 2019 13:31:46 +0000, [email protected] wrote:
From: Filipe Manana <[email protected]>
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:
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
"Btrfs-progs: fix mount point detection due to partial prefix match"
Reported-by David Disseldorp <[email protected]>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.