From 21643f8427be22ab7e512acf6c6368eb8af1ec9d Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 21 Jun 2015 12:00:52 +0200 Subject: 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 >> Signed-off-by: Niels de Vos >> Reviewed-on: http://review.gluster.org/9223 >> Tested-by: Gluster Build System >> Reviewed-by: soumya k >> Reviewed-by: jiffin tony Thottan >> Reviewed-by: Kaleb KEITHLEY > > 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 >> Reviewed-on: http://review.gluster.org/10419 >> Tested-by: Gluster Build System >> Reviewed-by: Vijay Bellur >> > > Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d > BUG: 1215385 > Signed-off-by: Niels de Vos > Reviewed-on: http://review.gluster.org/10379 > Tested-by: NetBSD Build System > Tested-by: Gluster Build System > Reviewed-by: Vijay Bellur Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d BUG: 1234096 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/11335 Tested-by: Gluster Build System Reviewed-by: Raghavendra Bhat --- libglusterfs/src/store.c | 2 +- libglusterfs/src/store.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/store.c b/libglusterfs/src/store.c index d6a64d2cdd3..c96cd2fab24 100644 --- a/libglusterfs/src/store.c +++ b/libglusterfs/src/store.c @@ -374,7 +374,7 @@ out: } int32_t -gf_store_handle_new (char *path, gf_store_handle_t **handle) +gf_store_handle_new (const char *path, gf_store_handle_t **handle) { int32_t ret = -1; gf_store_handle_t *shandle = NULL; diff --git a/libglusterfs/src/store.h b/libglusterfs/src/store.h index 1ffd97c526f..6b7c98a3547 100644 --- a/libglusterfs/src/store.h +++ b/libglusterfs/src/store.h @@ -74,7 +74,7 @@ int32_t gf_store_save_value (int fd, char *key, char *value); int32_t -gf_store_handle_new (char *path, gf_store_handle_t **handle); +gf_store_handle_new (const char *path, gf_store_handle_t **handle); int gf_store_handle_retrieve (char *path, gf_store_handle_t **handle); -- cgit