From: Martin Schwenke <martin@meltin.net>
Date: Tue, 24 Apr 2018 04:13:35 +0000 (+1000)
Subject: ctdb-scripts: Drop CTDB_SUPPRESS_COREFILE and CTDB_MAX_OPEN_FILES options
X-Git-Tag: ldb-1.4.0~278
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9d01fddc651798a50c2a2bf0d596d5f9d7eb6a1;p=thirdparty%2Fsamba.git

ctdb-scripts: Drop CTDB_SUPPRESS_COREFILE and CTDB_MAX_OPEN_FILES options

These should be done using features provided by the operating system.

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

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Sat May 12 09:13:28 CEST 2018 on sn-devel-144
---

diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf
index 3fe5c8285d2..57cb3495c1b 100644
--- a/ctdb/config/ctdbd.conf
+++ b/ctdb/config/ctdbd.conf
@@ -13,9 +13,6 @@
 # CTDB_MANAGES_WINBIND=yes
 # CTDB_MANAGES_NFS=yes
 
-# Raise the file descriptor limit for CTDB?
-# 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 320e02cf078..e8f0a23a257 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -88,20 +88,6 @@ start()
 
     export_debug_variables
 
-    # Explicitly trying to disable core files, no other way
-    # shellcheck disable=SC2039
-    if [ "$CTDB_SUPPRESS_COREFILE" = "yes" ]; then
-	ulimit -c 0
-    else
-	ulimit -c unlimited
-    fi
-
-    # Unsupported option easily avoided by not using configuration variable
-    # shellcheck disable=SC2039
-    if [ -n "$CTDB_MAX_OPEN_FILES" ]; then
-	ulimit -n "$CTDB_MAX_OPEN_FILES"
-    fi
-
     eval "$ctdbd" "$ctdb_options" || return 1
 
     # Wait until ctdbd has started and is ready to respond to clients.
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index b7010ef8c8c..e02e86c7568 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -248,18 +248,6 @@
 	</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_NOSETSCHED=yes|no</term>
 	<listitem>
@@ -361,18 +349,6 @@
 	</listitem>
       </varlistentry>
 
-      <varlistentry>
-	<term>CTDB_SUPPRESS_COREFILE=yes|no</term>
-	<listitem>
-	  <para>
-	    Whether CTDB core files should be suppressed.
-	  </para>
-	  <para>
-	    Default is no.
-	  </para>
-	</listitem>
-      </varlistentry>
-
       <varlistentry>
 	<term>CTDB_TRANSPORT=tcp|infiniband</term>
 	<listitem>