c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Drop path prefix workaround

Browse Source 
Canonicalization, the source of the trouble, was disabled in 9000a9f.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Sterling Jensen <sterlingjensen@users.noreply.github.com>
Closes #11295
This commit is contained in:
sterlingjensen
2020-12-09 23:24:26 -06:00
committed by GitHub
parent ab4fb9b74e
commit 1e4667af32
2 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_013_pos.ksh
+22 -20
View File
@@ -25,15 +25,15 @@
verify_runnable "both"
set -A vdevs $(get_disklist_fullpath $TESTPOOL)
vdev=${vdevs[0]}
mntpoint=$TESTDIR/$TESTPOOL
helper="mount.zfs -o zfsutil"
fs=$TESTPOOL/$TESTFS
typeset -r mntpoint=$(get_prop mountpoint $TESTPOOL)
typeset -r helper="mount.zfs -o zfsutil"
typeset -r fs=$TESTPOOL/$TESTFS
function cleanup
{
log_must force_unmount $vdev
[[ -d $mntpoint ]] && log_must rm -rf $mntpoint
cd $STF_SUITE
[[ -d $TESTDIR/$$ ]] && (rm -rf $TESTDIR/$$ || log_fail)
mounted && zfs $mountcmd $TESTPOOL
return 0
}
log_onexit cleanup
@@ -41,18 +41,21 @@ log_onexit cleanup
log_note "Verify zfs mount helper functions for both devices and pools"
# Ensure that the ZFS filesystem is unmounted
force_unmount $fs
log_must mkdir -p $mntpoint
force_unmount $TESTPOOL
log_note "Verify '<dataset> <path>'"
log_must $helper $fs $mntpoint
log_must ismounted $fs
force_unmount $fs
log_note "Verify '\$PWD/<pool> <path>' prefix workaround"
log_must $helper $PWD/$fs $mntpoint
log_must ismounted $fs
force_unmount $fs
log_note "Verify mount(8) does not canonicalize before calling helper"
# Canonicalization is confused by files in PWD matching [device|mountpoint]
mkdir -p $TESTDIR/$$/$TESTPOOL && cd $TESTDIR/$$ || log_fail
# The env flag directs zfs to exec /bin/mount, which then calls helper
log_must eval ZFS_MOUNT_HELPER=1 zfs $mountcmd -v $TESTPOOL
# mount (2.35.2) still suffers from a cosmetic PWD prefix bug
log_must mounted $TESTPOOL
force_unmount $TESTPOOL
log_note "Verify '-f <dataset> <path>' fakemount"
log_must $helper -f $fs $mntpoint
@@ -63,14 +66,13 @@ log_must ${helper},ro -v $fs $mntpoint
log_must ismounted $fs
force_unmount $fs
log_note "Verify '<device> <path>'"
log_must $helper $vdev $mntpoint
log_must ismounted $mntpoint
log_must umount $TESTPOOL
log_note "Verify '-o abc -s <device> <path>' sloppy option"
log_must ${helper},abc -s $vdev $mntpoint
log_must ismounted $mntpoint
log_must umount $TESTPOOL
log_must ${helper},abc -s ${vdevs[0]} $mntpoint
log_must mounted $mntpoint
force_unmount $TESTPOOL
log_note "Verify '<device> <path>'"
log_must $helper ${vdevs[0]} $mntpoint
log_must mounted $mntpoint
log_pass "zfs mount helper correctly handles both device and pool strings"