From 3cf776c49bc60b7f616a4c503a8b10b2d19ad04b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 21 Jun 2015 15:07:58 +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 GLUSTERD_WORKDIR has been added to tests/include.rc and is not configurable through ./configure like on newer branches. It is not suitable to change the GlusterD working directory in an update for a stable release. Change-Id: I40c4d8d754932f86fb2b1b2588843390464c773d BUG: 1166862 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/11336 Tested-by: Gluster Build System Reviewed-by: jiffin tony Thottan Reviewed-by: Kaleb KEITHLEY --- tests/include.rc | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/include.rc') diff --git a/tests/include.rc b/tests/include.rc index 8043d6090ad..fc0ad6cc2b5 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -7,6 +7,7 @@ B0=${B0:=/d/backends}; # top level of brick directories H0=${H0:=`hostname --fqdn`}; # hostname DEBUG=${DEBUG:=0} # turn on debugging? statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump +GLUSTERD_WORKDIR=/var/lib/glusterd # hardcoded for 3.5-stable CLI="gluster --mode=script"; CC=cc -- cgit