diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-07-13 15:02:48 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-07-14 09:57:18 +0200 |
| commit | 1e4016036c4c2812250c286574e16e2c77603b33 (patch) | |
| tree | 622220fea186ad8c91772acf0fd750cf910c9e00 /ctdb/doc | |
| parent | 9c87d1dd29165beca570dbf015953e24b967ec98 (diff) | |
| download | samba-1e4016036c4c2812250c286574e16e2c77603b33.tar.gz | |
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>
Diffstat (limited to 'ctdb/doc')
| -rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 25 | ||||
| -rw-r--r-- | ctdb/doc/examples/cluster.conf | 1 | ||||
| -rw-r--r-- | ctdb/doc/examples/external.conf | 1 | ||||
| -rw-r--r-- | ctdb/doc/examples/natgw.conf | 1 |
4 files changed, 0 insertions, 28 deletions
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml index a0335832306..ae037bfc6c1 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -1031,31 +1031,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 </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> <para> diff --git a/ctdb/doc/examples/cluster.conf b/ctdb/doc/examples/cluster.conf index 8da982c53f2..030276279aa 100644 --- 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 8354e5c3ced..02191452d54 100644 --- 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 ce8f04113ef..e1e75c78c65 100644 --- 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 |