ctdb-scripts: Remove configuration variable CTDB_MONITOR_NFS_THREAD_COUNT

This is now always enabled.  If nfsd thread monitoring is not required
then make CTDB_NFS_CALLOUT point to a wrapper around
nfs-linux-kernel-callout that does not implement "monitor-post".

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index a0335832306c6ba8607eacdcecd0e33a2048fb99..ae037bfc6c1824c46700c58764a7505b6f32864f 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1030,31 +1030,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
          </listitem>
        </varlistentry>
 
-       <varlistentry>
-         <term>CTDB_MONITOR_NFS_THREAD_COUNT=yes|no</term>
-         <listitem>
-           <para>
-             Whether to monitor the NFS kernel server thread count.
-           </para>
-           <para>
-             This works around a limitation in some NFS initscripts
-             where some threads can be stuck in host filesystem calls
-             (perhaps due to slow storage), a restart occurs, some
-             threads don't exit, the start only adds the missing
-             number of threads, the stuck threads exit, and the
-             result is a lower than expected thread count.  Note that
-             if you must also set <varname>RPCNFSDCOUNT</varname>
-             (RedHat/Debian) or <varname>USE_KERNEL_NFSD_NUMBER</varname>
-             (SUSE) in your NFS configuration so the monitoring code
-             knows how many threads there should be - if neither of
-             these are set then this option will be ignored.
-           </para>
-           <para>
-             Default is no.
-           </para>
-         </listitem>
-       </varlistentry>
-
        <varlistentry>
          <term>CTDB_NFS_CALLOUT=<parameter>COMMAND</parameter></term>
          <listitem>

diff --git a/ctdb/doc/examples/cluster.conf b/ctdb/doc/examples/cluster.conf
index 8da982c53f243c076d6d76a7b881ee1f6457953b..030276279aa306dfcb57f1c67ad2c07a64b20d07 100644 (file)
--- a/ctdb/doc/examples/cluster.conf
+++ b/ctdb/doc/examples/cluster.conf
@@ -89,4 +89,3 @@ CTDB_MANAGES_WINBIND=yes
 #
 CTDB_MANAGES_NFS=yes
 CTDB_RPCINFO_LOCALHOST="127.0.0.1"
-# CTDB_MONITOR_NFS_THREAD_COUNT=yes

diff --git a/ctdb/doc/examples/external.conf b/ctdb/doc/examples/external.conf
index 8354e5c3ceddea3e34f07dc6898fab5c3261c62a..02191452d54ed3ebbfeec3ae4ae8b6ab4e9feeb5 100644 (file)
--- a/ctdb/doc/examples/external.conf
+++ b/ctdb/doc/examples/external.conf
@@ -105,4 +105,3 @@ CTDB_MANAGES_WINBIND=yes
 #
 CTDB_MANAGES_NFS=yes
 CTDB_RPCINFO_LOCALHOST="127.0.0.1"
-# CTDB_MONITOR_NFS_THREAD_COUNT=yes

diff --git a/ctdb/doc/examples/natgw.conf b/ctdb/doc/examples/natgw.conf
index ce8f04113ef33d542b94d68b2a75cd811e44a5cd..e1e75c78c65a7a16f47b89ad1524d58a54f4e5b6 100644 (file)
--- a/ctdb/doc/examples/natgw.conf
+++ b/ctdb/doc/examples/natgw.conf
@@ -91,7 +91,6 @@ CTDB_MANAGES_WINBIND=yes
 #
 CTDB_MANAGES_NFS=yes
 CTDB_RPCINFO_LOCALHOST="127.0.0.1"
-# CTDB_MONITOR_NFS_THREAD_COUNT=yes
 
 #
 # NAT gateway configuration

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.102.sh b/ctdb/tests/eventscripts/60.nfs.monitor.102.sh
index 509dc2a705e25013f4247ac33e5fb4389ac0e541..5bb72b65255fcae88bff2bebf10f4dac62f0010d 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.102.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.102.sh
@@ -6,7 +6,6 @@ define_test "all services available, check nfsd thread count, count matches"
 
 setup_nfs
 
-CTDB_MONITOR_NFS_THREAD_COUNT="yes"
 RPCNFSDCOUNT=8
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5 6 7 8
 

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.103.sh b/ctdb/tests/eventscripts/60.nfs.monitor.103.sh
index 2bf44f0efa988424d5620224a6652d7adeea9753..cf2491d009ce44f5d16ae1f6afca673a7ef1cc38 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.103.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.103.sh
@@ -6,7 +6,6 @@ define_test "all services available, check nfsd thread count, not enough threads
 
 setup_nfs
 
-CTDB_MONITOR_NFS_THREAD_COUNT="yes"
 RPCNFSDCOUNT=8
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5
 

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.104.sh b/ctdb/tests/eventscripts/60.nfs.monitor.104.sh
index 64831ee343417fecff1a4ecfd2266d10ab597d72..ea3f66561a120f1b319fe1e8897b0ae79e8d1cac 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.104.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.104.sh
@@ -9,7 +9,6 @@ define_test "all services available, check nfsd thread count, too many threads"
 
 setup_nfs
 
-CTDB_MONITOR_NFS_THREAD_COUNT="yes"
 RPCNFSDCOUNT=4
 nfs_setup_fake_threads "nfsd" 1 2 3 4 5 6
 

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index a1ba67d9981b8b9aef9b2fc14ded865bc41c1932..6ba96fbf7d91a9c1258635521e65d4cff351144d 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -789,7 +789,7 @@ setup_nfs ()
 
     export CTDB_NFS_SKIP_SHARE_CHECK="no"
 
-    export CTDB_MONITOR_NFS_THREAD_COUNT RPCNFSDCOUNT
+    export RPCNFSDCOUNT
     export CTDB_NFS_DUMP_STUCK_THREADS
 
     # Reset the failcounts for nfs services.