From: fdmanana@kernel.org
To: linux-btrfs@vger.kernel.org
Cc: ddis@suse.com, Filipe Manana <fdmanana@suse.com>
Subject: [PATCH 3/3] Btrfs-progs: add test for receive
Date: Mon, 14 Jan 2019 13:31:46 +0000 [thread overview]
Message-ID: <20190114133146.18424-1-fdmanana@kernel.org> (raw)
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
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
--
2.11.0
next reply other threads:[~2019-01-14 13:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 13:31 fdmanana [this message]
2019-01-14 14:08 ` [PATCH 3/3] Btrfs-progs: add test for receive David Disseldorp
2019-01-14 14:11 ` Filipe Manana
2019-01-15 17:26 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190114133146.18424-1-fdmanana@kernel.org \
--to=fdmanana@kernel.org \
--cc=ddis@suse.com \
--cc=fdmanana@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox