Attachment 951449 Details for Bug 1158130 – Patch to allow mounting with -o fopen-keep-cache=off

[patch] Patch to allow mounting with -o fopen-keep-cache=off

glusterfs-3.6-fopen_keep_cache.patch (text/plain), 4.46 KB, created by Philip Spencer on 2014-10-28 16:22:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Spencer

Created: 2014-10-28 16:22:02 UTC

Size: 4.46 KB

patch

obsolete

>diff -ur glusterfs-3.6.0beta3.orig/doc/glusterfs.8 glusterfs-3.6.0beta3/doc/glusterfs.8
>--- glusterfs-3.6.0beta3.orig/doc/glusterfs.8	2014-09-30 14:17:59.000000000 -0400
>+++ glusterfs-3.6.0beta3/doc/glusterfs.8	2014-10-28 10:22:10.192893584 -0400
>@@ -60,8 +60,8 @@
> \fB\-\-enable\-ino32=BOOL\fR
> Use 32-bit inodes when mounting to workaround application that doesn't support 64-bit inodes.
> .TP
>-\fB\-\-fopen\-keep\-cache\fR
>-Do not purge the cache on file open.
>+\fB\-\-fopen\-keep\-cache[=BOOL]\fR
>+Do not purge the cache on file open (set by default if fuse supports automatic cache invalidation).
> .TP
> \fB\-\-mac\-compat=BOOL\fR
> Provide stubs for attributes needed for seamless operation on Macs (the default is off).
>--- glusterfs-3.6.0beta3.orig/doc/mount.glusterfs.8	2014-09-30 14:17:59.000000000 -0400
>+++ glusterfs-3.6.0beta3/doc/mount.glusterfs.8	2014-10-28 11:14:35.324906970 -0400
>@@ -44,8 +44,8 @@
> \fBacl
> Mount the filesystem with POSIX ACL support
> .TP
>-\fBfopen\-keep\-cache
>-Do not purge the cache on file open
>+\fBfopen\-keep\-cache[=BOOL]
>+Do not purge the cache on file open (set by default if fuse supports automatic cache invalidation)
> .TP
> \fBselinux
> Enable SELinux label (extened attributes) support on inodes
>diff -ur glusterfs-3.6.0beta3.orig/xlators/mount/fuse/src/fuse-bridge.c glusterfs-3.6.0beta3/xlators/mount/fuse/src/fuse-bridge.c
>--- glusterfs-3.6.0beta3.orig/xlators/mount/fuse/src/fuse-bridge.c	2014-09-30 14:17:59.000000000 -0400
>+++ glusterfs-3.6.0beta3/xlators/mount/fuse/src/fuse-bridge.c	2014-10-28 10:22:10.194893637 -0400
>@@ -5663,7 +5663,7 @@
>         },
>         { .key = {"fopen-keep-cache"},
>           .type = GF_OPTION_TYPE_BOOL,
>-          .default_value = "false"
>+          .default_value = "true if fuse supports automatic cache invalidation"
>         },
>         { .key = {"gid-timeout"},
>           .type = GF_OPTION_TYPE_INT,
>diff -ur glusterfs-3.6.0beta3.orig/xlators/mount/fuse/utils/mount.glusterfs.in glusterfs-3.6.0beta3/xlators/mount/fuse/utils/mount.glusterfs.in
>--- glusterfs-3.6.0beta3.orig/xlators/mount/fuse/utils/mount.glusterfs.in	2014-09-30 14:17:59.000000000 -0400
>+++ glusterfs-3.6.0beta3/xlators/mount/fuse/utils/mount.glusterfs.in	2014-10-28 10:22:10.194893637 -0400
>@@ -159,10 +159,6 @@
>        cmd_line=$(echo "$cmd_line --volfile-max-fetch-attempts=$volfile_max_fetch_attempts")
>     fi
> 
>-    if [ -n "$fopen_keep_cache" ]; then
>-        cmd_line=$(echo "$cmd_line --fopen-keep-cache");
>-    fi
>-
>     if [ -n "$volfile_check" ]; then
>         cmd_line=$(echo "$cmd_line --volfile-check");
>     fi
>@@ -179,7 +175,13 @@
>         cmd_line=$(echo "$cmd_line --no-root-squash");
>     fi
> 
>-#options with values start here
>+#options with optional values start here
>+
>+    if [ -n "$fopen_keep_cache_specified" ]; then
>+        cmd_line=$(echo "$cmd_line --fopen-keep-cache$fopen_keep_cache");
>+    fi
>+
>+#options with mandatory values start here
>     if [ -n "$log_level" ]; then
>         cmd_line=$(echo "$cmd_line --log-level=$log_level");
>     fi
>@@ -464,6 +466,11 @@
>                 [ $value = "false" ] ; then
>                 no_root_squash=1;
>             fi ;;
>+# Values that are optional
>+        "fopen-keep-cache")
>+            fopen_keep_cache_specified=1
>+	    fopen_keep_cache="=$value"
>+	    ;;
>         *)
>             warn "Invalid option: $key"
>             exit 1
>@@ -488,9 +495,6 @@
>         "worm")
>             worm=1
>             ;;
>-        "fopen-keep-cache")
>-            fopen_keep_cache=1
>-            ;;
>         "enable-ino32")
>             enable_ino32=1
>             ;;
>@@ -510,6 +514,11 @@
>             ;;
>         "_netdev")
>             ;;
>+# Values that are optional
>+        "fopen-keep-cache")
>+            fopen_keep_cache_specified=1
>+	    fopen_keep_cache=""
>+            ;;
>         *)
>             warn "Invalid option $option";
>             exit 1
>--- glusterfs-3.6.0beta3.orig/glusterfsd/src/glusterfsd.c	2014-09-30 14:17:59.000000000 -0400
>+++ glusterfs-3.6.0beta3/glusterfsd/src/glusterfsd.c	2014-10-28 11:21:00.244301352 -0400
>@@ -174,7 +174,7 @@
>         {"brick-port", ARGP_BRICK_PORT_KEY, "BRICK-PORT", OPTION_HIDDEN,
>          "Brick Port to be registered with Gluster portmapper" },
> 	{"fopen-keep-cache", ARGP_FOPEN_KEEP_CACHE_KEY, "BOOL", OPTION_ARG_OPTIONAL,
>-	 "Do not purge the cache on file open"},
>+	 "Do not purge the cache on file open [default: set if fuse supports automatic cache invalidation]"},
> 
>         {0, 0, 0, 0, "Fuse options:"},
>         {"direct-io-mode", ARGP_DIRECT_IO_MODE_KEY, "BOOL", OPTION_ARG_OPTIONAL,

Actions: View | Diff

Attachments on bug 1158130: 951449