20468: Adds config knobs for RailsAPI & controller performance tuning.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
index bf046f6644ebdd545617839644cc07e1fb33fdc3..9ba5af9bc675a7c4483faa766e376b3c97c472f9 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/arvados.sls
@@ -107,6 +107,12 @@ arvados:
             Email: __INITIAL_USER_EMAIL__
             Password: __INITIAL_USER_PASSWORD__
 
+    ### API
+    {%- if "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" != "" %}
+    API:
+      MaxConcurrentRequests: __CONTROLLER_MAX_CONCURRENT_REQUESTS__
+    {%- endif %}
+
     ### CONTAINERS
     Containers:
       MaxRetryAttempts: 10

diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
index c14fbd1f59214263bca6634a20a3b11bf4ea08cf..775ff80fe44450f5ecea970c0005ef0adfb01d4d 100644 (file)
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_passenger.sls
@@ -21,6 +21,11 @@ nginx:
   ### PASSENGER
   passenger:
     passenger_ruby: {{ passenger_ruby }}
+    passenger_max_pool_size: {{ "__CONTROLLER_NGINX_WORKERS__" or grains['num_cpus'] }}
+    {%- if "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" != "" %}
+    # Default is 100
+    passenger_max_request_queue_size: __CONTROLLER_MAX_CONCURRENT_REQUESTS__
+    {%- endif %}
 
   ### SERVER
   server:
@@ -36,7 +41,10 @@ nginx:
       # include: 'modules-enabled/*.conf'
       load_module: {{ passenger_mod }}
       {% endif %}
-      worker_processes: 4
+      worker_processes: {{ "__CONTROLLER_NGINX_WORKERS__" or grains['num_cpus'] }}
+      worker_rlimit_nofile: 4096
+      events:
+        worker_connections: 1024
 
   ### SNIPPETS
   snippets:

diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts
index 72f910b735f31f273641b1741ef2a1f0996215f1..fd1919e0cc12e9b5912c5dc180d3336a8f2b20e5 100644 (file)
--- a/tools/salt-install/local.params.example.multiple_hosts
+++ b/tools/salt-install/local.params.example.multiple_hosts
@@ -132,6 +132,10 @@ WEBSHELL_INT_IP=10.1.1.15
 DATABASE_INT_IP=10.1.1.11
 SHELL_INT_IP=10.1.2.17
 
+# Performance tuning parameters
+#CONTROLLER_NGINX_WORKERS=
+#CONTROLLER_MAX_CONCURRENT_REQUESTS=
+
 # The directory to check for the config files (pillars, states) you want to use.
 # There are a few examples under 'config_examples'.
 # CONFIG_DIR="local_config_dir"

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index 012e003717ef70a2ca27f1dee12b66406b7b75d3..4f044c42e9e2c323ed0289ed4bd947f9ee46546e 100755 (executable)
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -453,6 +453,8 @@ for f in $(ls "${SOURCE_PILLARS_DIR}"/*); do
        s#__SSL_KEY_ENCRYPTED__#${SSL_KEY_ENCRYPTED}#g;
        s#__SSL_KEY_AWS_REGION__#${SSL_KEY_AWS_REGION}#g;
        s#__SSL_KEY_AWS_SECRET_NAME__#${SSL_KEY_AWS_SECRET_NAME}#g;
+       s#__CONTROLLER_NGINX_WORKERS__#${CONTROLLER_NGINX_WORKERS}#g;
+       s#__CONTROLLER_MAX_CONCURRENT_REQUESTS__#${CONTROLLER_MAX_CONCURRENT_REQUESTS}#g;
        s#__MONITORING_USERNAME__#${MONITORING_USERNAME}#g;
        s#__MONITORING_EMAIL__#${MONITORING_EMAIL}#g;
        s#__MONITORING_PASSWORD__#${MONITORING_PASSWORD}#g" \
@@ -530,6 +532,8 @@ if [ -d "${SOURCE_STATES_DIR}" ]; then
          s#__SSL_KEY_ENCRYPTED__#${SSL_KEY_ENCRYPTED}#g;
          s#__SSL_KEY_AWS_REGION__#${SSL_KEY_AWS_REGION}#g;
          s#__SSL_KEY_AWS_SECRET_NAME__#${SSL_KEY_AWS_SECRET_NAME}#g;
+         s#__CONTROLLER_NGINX_WORKERS__#${CONTROLLER_NGINX_WORKERS}#g;
+         s#__CONTROLLER_MAX_CONCURRENT_REQUESTS__#${CONTROLLER_MAX_CONCURRENT_REQUESTS}#g;
          s#__MONITORING_USERNAME__#${MONITORING_USERNAME}#g;
          s#__MONITORING_EMAIL__#${MONITORING_EMAIL}#g;
          s#__MONITORING_PASSWORD__#${MONITORING_PASSWORD}#g" \