From 702b2912970e7cc19416aff7d3696d15977efc2f Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 9 Nov 2012 14:43:38 +0100 Subject: fuse: handle mountflags properly The internal mount API had no access to the generic mountflags used by mount(2). Thus the "ro" mount option that needs to be passed down to mount(2) as as a mountflag was incorrectly mangled into the fuse-specific mount parameter string (cf. http://review.gluster.com/655). This commit fixes the internal API and the "ro" issue. It also adds a check for the "rw" and "ro" mount options in tests/basic/mount.t. Thanks to Csaba Henk (csaba@) for suggestions and proposing an updated patch. Change-Id: I7f7bf49ae44d148f5c16f10736a0e412fb8f5e67 BUG: 853895 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/4163 Reviewed-by: Csaba Henk Tested-by: Gluster Build System --- tests/basic/mount.t | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'tests/basic') diff --git a/tests/basic/mount.t b/tests/basic/mount.t index 0fdef65d..7b276964 100755 --- a/tests/basic/mount.t +++ b/tests/basic/mount.t @@ -34,9 +34,20 @@ EXPECT 'Started' volinfo_field $V0 'Status'; ## Make volume tightly consistent for metdata TEST $CLI volume set $V0 performance.stat-prefetch off; -## Mount FUSE with caching disabled +## Mount FUSE with caching disabled (read-write) TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0; +## Check consistent "rw" option +TEST 'mount -t fuse.glusterfs | grep -E "^$H0:$V0 .+ \(rw,"'; +TEST 'grep -E "^$H0:$V0 .+ ,?rw," /proc/mounts'; + +## Mount FUSE with caching disabled (read-only) +TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --read-only -s $H0 --volfile-id $V0 $M1; + +## Check consistent "ro" option +TEST 'mount -t fuse.glusterfs | grep -E "^$H0:$V0 .+ \(ro,"'; +TEST 'grep -E "^$H0:$V0 .+ ,?ro,.+" /proc/mounts'; + ## Wait for volume to register with rpc.mountd sleep 5; @@ -45,11 +56,16 @@ TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0; ## Test for consistent views between NFS and FUSE mounts +## write access to $M1 should fail TEST ! stat $M0/newfile; +TEST ! touch $M1/newfile; TEST touch $M0/newfile; +TEST stat $M1/newfile; TEST stat $N0/newfile; +TEST ! rm $M1/newfile; TEST rm $N0/newfile; TEST ! stat $M0/newfile; +TEST ! stat $M1/newfile; ## Finish up -- cgit