Make ulimit on App server configurable / $ULIMIT env var (#2818)

* Make ulimit on App server configurable

* make sure env var is a str

benchmark.cfg.example

@@ -25,6 +25,7 @@ type=all
 verbose=True
 clean=False
 clean_all=False
+ulimit=200000
 #results_name=My Benchmarking Run %%Y-%%m-%%d %%H:%%M:%%S
 #results_environment=My Server Environment
 #results_upload_uri=https://example.com/uploads

deployment/vagrant/bootstrap.sh

@@ -64,6 +64,7 @@ type=all
 verbose=True
 clean=False
 clean_all=False
+ulimit=200000
 EOF
 
   source ./toolset/setup/linux/prerequisites.sh

toolset/benchmark/benchmarker.py

@@ -350,7 +350,6 @@ class Benchmarker:
                 return True
             subprocess.call(['sudo', 'sysctl', '-w', 'net.ipv4.tcp_max_syn_backlog=65535'], stdout=self.quiet_out, stderr=subprocess.STDOUT)
             subprocess.call(['sudo', 'sysctl', '-w', 'net.core.somaxconn=65535'], stdout=self.quiet_out, stderr=subprocess.STDOUT)
-            subprocess.call(['sudo', '-s', 'ulimit', '-n', '65535'], stdout=self.quiet_out, stderr=subprocess.STDOUT)
             subprocess.call(['sudo', 'sysctl', 'net.ipv4.tcp_tw_reuse=1'], stdout=self.quiet_out, stderr=subprocess.STDOUT)
             subprocess.call(['sudo', 'sysctl', 'net.ipv4.tcp_tw_recycle=1'], stdout=self.quiet_out, stderr=subprocess.STDOUT)
             subprocess.call(['sudo', 'sysctl', '-w', 'kernel.shmmax=134217728'], stdout=self.quiet_out, stderr=subprocess.STDOUT)

toolset/run-tests.py

@@ -118,6 +118,10 @@ def main(argv=None):
         defaults['database_host'] = defaults['client_host']
     if defaults['server_host'] is None:
         defaults['server_host'] = defaults['client_host']
+    if defaults['ulimit'] is None:
+        defaults['ulimit'] = 200000
+
+    os.environ['ULIMIT'] = str(defaults['ulimit'])
 
     ##########################################################
     # Set up argument parser

toolset/setup/linux/prerequisites.sh

@@ -36,7 +36,18 @@ sudo pip install colorama==0.3.1
 sudo pip install progressbar==2.2
 sudo pip install requests
 
-sudo sh -c "echo '*               -    nofile          65535' >> /etc/security/limits.conf"
+# Get the ulimit from the benchmark config
+if [ -f benchmark.cfg ]; then
+  FILE=benchmark.cfg
+else
+  FILE=benchmark.cfg.example
+fi
+
+ULIMIT=$(grep '^ulimit=' $FILE | grep -Po '[0-9]+')
+
+if [ ! $ULIMIT ]; then ULIMIT=200000; fi;
+
+sudo sh -c "echo '*               -    nofile          ${ULIMIT}' >> /etc/security/limits.conf"
 sudo sh -c "echo '*            hard    rtprio             99' >> /etc/security/limits.conf"
 sudo sh -c "echo '*            soft    rtprio             99' >> /etc/security/limits.conf"