diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-24 14:13:35 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-05-12 09:13:28 +0200 |
| commit | b9d01fddc651798a50c2a2bf0d596d5f9d7eb6a1 (patch) | |
| tree | 7954dcdb45fd256f3bcff02263c23613241cd56e /ctdb/config | |
| parent | 7e31a1382fd5eb45448042960e90885462b1452a (diff) | |
| download | samba-b9d01fddc651798a50c2a2bf0d596d5f9d7eb6a1.tar.gz | |
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
Diffstat (limited to 'ctdb/config')
| -rw-r--r-- | ctdb/config/ctdbd.conf | 3 | ||||
| -rwxr-xr-x | ctdb/config/ctdbd_wrapper | 14 |
2 files changed, 0 insertions, 17 deletions
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. |