ctdb-scripts: Add new configuration variable CTDB_MAX_OPEN_FILES

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

diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
index 9541d503c75e2f092cdb9c25bcff8db30f78536b..0a3a23eb2849cf7478a8b9e049c7987eaa9923ee 100644 (file)
--- a/ctdb/config/ctdb.sysconfig
+++ b/ctdb/config/ctdb.sysconfig
@@ -20,7 +20,7 @@ CTDB_PUBLIC_ADDRESSES=/etc/ctdb/public_addresses
 # CTDB_MANAGES_NFS=yes
 
 # Raise the file descriptor limit for CTDB?
-# ulimit -n 10000
+# CTDB_MAX_OPEN_FILES=10000
 
 # Default is to use the log file below instead of syslog.
 # CTDB_LOGGING=file:/var/log/log.ctdb

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index aac8369691762e1eef5f4b171401139bb1af96b3..c5fe00451dfe1e188c1bbcd4646c0f0f65bbd9ed 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -176,6 +176,10 @@ start()
        ulimit -c unlimited
     fi
 
+    if [ -n "$CTDB_MAX_OPEN_FILES" ]; then
+       ulimit -n $CTDB_MAX_OPEN_FILES
+    fi
+
     mkdir -p $(dirname "$pidfile")
 
     if [ -n "$CTDB_VALGRIND" -a "$CTDB_VALGRIND" != "no" ] ; then

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index cc56d7909889017ba237af76bdc14bfae31de0d2..bb44317a42bb510954fd7de8a4d703a43572abf2 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1630,6 +1630,18 @@ CTDB_SET_MonitorInterval=20
        </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term>CTDB_MAX_OPEN_FILES=<parameter>NUM</parameter></term>
+       <listitem>
+         <para>
+           NUM is the maximum number of open files.
+         </para>
+         <para>
+           There is no default.
+         </para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
        <term>CTDB_RC_LOCAL=<parameter>FILENAME</parameter></term>
        <listitem>