nfs: make it possible to disable nfs.mount-rmtab

When there are many NFS-clients doing very often mount/unmount actions,
the updating of the 'rmtab' can become a bottleneck and cause delays. In
these situations, the output of 'showmount' may be less important than
the responsiveness of the (un)mounting.

By setting 'nfs.mount-rmtab' to the value "/-", the cache file is not
updated anymore, and the entries are only kept in memory.

Cherry picked from commit 40407afb529f6e5fa2f79e9778c2f527122d75eb:
> Cherry picked from commit 331ef6e1a86bfc0a93f8a9dec6ad35c417873849:
>> BUG: 1169317
>> Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d
>> Reported-by: Cyril Peponnet <cyril@peponnet.fr>
>> Signed-off-by: Niels de Vos <ndevos@redhat.com>
>> Reviewed-on: http://review.gluster.org/9223
>> Tested-by: Gluster Build System <jenkins@build.gluster.com>
>> Reviewed-by: soumya k <skoduri@redhat.com>
>> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
>> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
>
> This change also contains the fixes to the test-case from:
>>
>> nfs: fix spurious failure in bug-1166862.t
>>
>> In some environments, "showmount" could return an NFS-client that does
>> not start with "1". This would cause the test-case to fail. The check is
>> incorrect, the number of lines should get counted instead.
>>
>> Also moving the test-case to the .../nfs/... subdirectory.
>>
>> Cherry picked from commit ee9b35a780607daddc2832b9af5ed6bf414aebc0:
>> BUG: 1166862
>> Change-Id: Ic03aa8145ca57d78aea01564466e924b03bb302a
>> Signed-off-by: Niels de Vos <ndevos@redhat.com>
>> Reviewed-on: http://review.gluster.org/10419
>> Tested-by: Gluster Build System <jenkins@build.gluster.com>
>> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
>>
>
> Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d
> BUG: 1215385
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: http://review.gluster.org/10379
> Tested-by: NetBSD Build System
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>

Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d
BUG: 1234096
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/11335
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>

2 files changed, 77 insertions, 45 deletions

diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 677b4be7238..43a77f888cd 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -351,6 +351,25 @@ fail:
         gf_store_unlink_tmppath (sh);
 }
 
+static gf_boolean_t
+mount_open_rmtab (const char *rmtab, gf_store_handle_t **sh)
+{
+        int ret = -1;
+
+        /* updating the rmtab is disabled, use in-memory only */
+        if (!rmtab || rmtab[0] == '\0')
+                return _gf_false;
+
+        ret = gf_store_handle_new (rmtab, sh);
+        if (ret) {
+                gf_log (GF_MNT, GF_LOG_WARNING, "Failed to open '%s'", rmtab);
+                return _gf_false;
+        }
+
+        return _gf_true;
+}
+
+
 /* Read the rmtab into a clean ms->mountlist.
  */
 static void
@@ -358,16 +377,13 @@ mount_read_rmtab (struct mount3_state *ms)
 {
         gf_store_handle_t       *sh = NULL;
         struct nfs_state        *nfs = NULL;
-        int                     ret;
+        gf_boolean_t            read_rmtab = _gf_false;
 
         nfs = (struct nfs_state *)ms->nfsx->private;
 
-        ret = gf_store_handle_new (nfs->rmtab, &sh);
-        if (ret) {
-                gf_log (GF_MNT, GF_LOG_WARNING, "Failed to open '%s'",
-                        nfs->rmtab);
+        read_rmtab = mount_open_rmtab (nfs->rmtab, &sh);
+        if (!read_rmtab)
                 return;
-        }
 
         if (gf_store_lock (sh)) {
                 gf_log (GF_MNT, GF_LOG_WARNING, "Failed to lock '%s'",
@@ -387,6 +403,7 @@ out:
  * The rmtab could be empty, or it can exists and have been updated by a
  * different storage server without our knowing.
  *
+ * 0. if opening the nfs->rmtab fails, return gracefully
  * 1. takes the store_handle lock on the current rmtab
  *    - blocks if an other storage server rewrites the rmtab at the same time
  * 2. [if new_rmtab] takes the store_handle lock on the new rmtab
@@ -405,17 +422,15 @@ mount_rewrite_rmtab (struct mount3_state *ms, char *new_rmtab)
         struct nfs_state        *nfs = NULL;
         int                     ret;
         char                    *rmtab = NULL;
+        gf_boolean_t            got_old_rmtab = _gf_false;
 
         nfs = (struct nfs_state *)ms->nfsx->private;
 
-        ret = gf_store_handle_new (nfs->rmtab, &sh);
-        if (ret) {
-                gf_log (GF_MNT, GF_LOG_WARNING, "Failed to open '%s'",
-                        nfs->rmtab);
+        got_old_rmtab = mount_open_rmtab (nfs->rmtab, &sh);
+        if (!got_old_rmtab && !new_rmtab)
                 return;
-        }
 
-        if (gf_store_lock (sh)) {
+        if (got_old_rmtab && gf_store_lock (sh)) {
                 gf_log (GF_MNT, GF_LOG_WARNING, "Not rewriting '%s'",
                         nfs->rmtab);
                 goto free_sh;
@@ -437,7 +452,8 @@ mount_rewrite_rmtab (struct mount3_state *ms, char *new_rmtab)
         }
 
         /* always read the currently used rmtab */
-        __mount_read_rmtab (sh, &ms->mountlist, _gf_true);
+        if (got_old_rmtab)
+                __mount_read_rmtab (sh, &ms->mountlist, _gf_true);
 
         if (new_rmtab) {
                 /* read the new rmtab and write changes to the new location */
@@ -464,9 +480,11 @@ free_nsh:
         if (new_rmtab)
                 gf_store_handle_destroy (nsh);
 unlock_sh:
-        gf_store_unlock (sh);
+        if (got_old_rmtab)
+                gf_store_unlock (sh);
 free_sh:
-        gf_store_handle_destroy (sh);
+        if (got_old_rmtab)
+                gf_store_handle_destroy (sh);
 }
 
 /* Add a new NFS-client to the ms->mountlist and update the rmtab if we can.
@@ -490,6 +508,7 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
         char                    *colon = NULL;
         struct nfs_state        *nfs = NULL;
         gf_store_handle_t       *sh = NULL;
+        gf_boolean_t            update_rmtab = _gf_false;
 
         if ((!ms) || (!req) || (!expname))
                 return -1;
@@ -501,12 +520,7 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
 
         nfs = (struct nfs_state *)ms->nfsx->private;
 
-        ret = gf_store_handle_new (nfs->rmtab, &sh);
-        if (ret) {
-                gf_log (GF_MNT, GF_LOG_WARNING, "Failed to open '%s'",
-                        nfs->rmtab);
-                goto free_err;
-        }
+        update_rmtab = mount_open_rmtab (nfs->rmtab, &sh);
 
         strncpy (me->exname, expname, MNTPATHLEN);
 
@@ -516,7 +530,7 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
          */
         ret = rpcsvc_transport_peername (req->trans, me->hostname, MNTPATHLEN);
         if (ret == -1)
-                goto free_err2;
+                goto free_err;
 
         colon = strrchr (me->hostname, ':');
         if (colon) {
@@ -525,10 +539,10 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
         LOCK (&ms->mountlock);
         {
                 /* in case locking fails, we just don't write the rmtab */
-                if (gf_store_lock (sh)) {
+                if (update_rmtab && gf_store_lock (sh)) {
                         gf_log (GF_MNT, GF_LOG_WARNING, "Failed to lock '%s'"
                                 ", changes will not be written", nfs->rmtab);
-                } else {
+                } else if (update_rmtab) {
                         __mount_read_rmtab (sh, &ms->mountlist, _gf_false);
                 }
 
@@ -543,19 +557,19 @@ mnt3svc_update_mountlist (struct mount3_state *ms, rpcsvc_request_t *req,
                 list_add_tail (&me->mlist, &ms->mountlist);
 
                 /* only write the rmtab in case it was locked */
-                if (gf_store_locked_local (sh))
+                if (update_rmtab && gf_store_locked_local (sh))
                         __mount_rewrite_rmtab (ms, sh);
         }
 dont_add:
-        if (gf_store_locked_local (sh))
+        if (update_rmtab && gf_store_locked_local (sh))
                 gf_store_unlock (sh);
 
         UNLOCK (&ms->mountlock);
 
-free_err2:
-        gf_store_handle_destroy (sh);
-
 free_err:
+        if (update_rmtab)
+                gf_store_handle_destroy (sh);
+
         if (ret == -1)
                 GF_FREE (me);
 
@@ -1609,27 +1623,25 @@ mnt3svc_umount (struct mount3_state *ms, char *dirpath, char *hostname)
         int                     ret = -1;
         gf_store_handle_t       *sh = NULL;
         struct nfs_state        *nfs = NULL;
+        gf_boolean_t            update_rmtab = _gf_false;
 
         if ((!ms) || (!dirpath) || (!hostname))
                 return -1;
 
         nfs = (struct nfs_state *)ms->nfsx->private;
 
-        ret = gf_store_handle_new (nfs->rmtab, &sh);
-        if (ret) {
-                gf_log (GF_MNT, GF_LOG_WARNING, "Failed to open '%s'",
-                        nfs->rmtab);
-                return 0;
-        }
-
-        ret = gf_store_lock (sh);
-        if (ret) {
-                goto out_free;
+        update_rmtab = mount_open_rmtab (nfs->rmtab, &sh);
+        if (update_rmtab) {
+                ret = gf_store_lock (sh);
+                if (ret)
+                        goto out_free;
         }
 
         LOCK (&ms->mountlock);
         {
-                __mount_read_rmtab (sh, &ms->mountlist, _gf_false);
+                if (update_rmtab)
+                        __mount_read_rmtab (sh, &ms->mountlist, _gf_false);
+
                 if (list_empty (&ms->mountlist)) {
                         ret = 0;
                         goto out_unlock;
@@ -1661,13 +1673,20 @@ mnt3svc_umount (struct mount3_state *ms, char *dirpath, char *hostname)
 
                 list_del (&me->mlist);
                 GF_FREE (me);
-                __mount_rewrite_rmtab (ms, sh);
+
+                if (update_rmtab)
+                        __mount_rewrite_rmtab (ms, sh);
         }
 out_unlock:
         UNLOCK (&ms->mountlock);
-        gf_store_unlock (sh);
+
+        if (update_rmtab)
+                gf_store_unlock (sh);
+
 out_free:
-        gf_store_handle_destroy (sh);
+        if (update_rmtab)
+                gf_store_handle_destroy (sh);
+
         return ret;
 }
 
diff --git a/xlators/nfs/server/src/nfs.c b/xlators/nfs/server/src/nfs.c
index c149119bf4d..e3258abf023 100644
--- a/xlators/nfs/server/src/nfs.c
+++ b/xlators/nfs/server/src/nfs.c
@@ -881,6 +881,12 @@ nfs_init_state (xlator_t *this)
                         gf_log (GF_NFS, GF_LOG_ERROR, "Failed to parse dict");
                         goto free_foppool;
                 }
+
+                /* check if writing the rmtab is disabled*/
+                if (nfs->rmtab && strcmp ("/-", nfs->rmtab) == 0) {
+                        GF_FREE (nfs->rmtab);
+                        nfs->rmtab = NULL;
+                }
         }
 
         /* support both options rpc-auth.ports.insecure and
@@ -1109,7 +1115,13 @@ nfs_reconfigure_state (xlator_t *this, dict_t *options)
                 }
                 gf_path_strip_trailing_slashes (rmtab);
         }
-        if (strcmp (nfs->rmtab, rmtab) != 0) {
+        /* check if writing the rmtab is disabled*/
+        if (strcmp ("/-", rmtab) == 0) {
+                GF_FREE (nfs->rmtab);
+                nfs->rmtab = NULL;
+                gf_log (GF_NFS, GF_LOG_INFO,
+                                "Disabled writing of nfs.mount-rmtab");
+        } else if (!nfs->rmtab || strcmp (nfs->rmtab, rmtab) != 0) {
                 mount_rewrite_rmtab (nfs->mstate, rmtab);
                 gf_log (GF_NFS, GF_LOG_INFO,
                                 "Reconfigured nfs.mount-rmtab path: %s",
@@ -1857,7 +1869,8 @@ struct volume_options options[] = {
                          "list all the NFS-clients that have connected "
                          "through the MOUNT protocol. If this is on shared "
                          "storage, all GlusterFS servers will update and "
-                         "output (with 'showmount') the same list."
+                         "output (with 'showmount') the same list. Set to "
+                         "\"/-\" to disable."
         },
         { .key = {OPT_SERVER_RPC_STATD},
           .type = GF_OPTION_TYPE_PATH,