20474: Adds 5 to controller's request queue size for RailsAPI.

This size difference would allow extra requests (like metrics) to happen
even on heavily loaded clusters.

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 ef5a91b270d074fe2064d04808ebf23d02efc4d5..51842b6e2a2e5b177ff29a013e0f3163fcc196d3 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
@@ -108,9 +108,10 @@ arvados:
             Password: __INITIAL_USER_PASSWORD__
 
     ### API
-    {%- if "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" != "" %}
+    {%- set max_reqs = "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" %}
+    {%- if max_reqs != "" and max_reqs is number %}
     API:
-      MaxConcurrentRequests: __CONTROLLER_MAX_CONCURRENT_REQUESTS__
+      MaxConcurrentRequests: max_reqs
     {%- endif %}
 
     ### CONTAINERS

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 775ff80fe44450f5ecea970c0005ef0adfb01d4d..bd1aacffac09db43041ed884115c4932e0064576 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
@@ -22,9 +22,10 @@ nginx:
   passenger:
     passenger_ruby: {{ passenger_ruby }}
     passenger_max_pool_size: {{ "__CONTROLLER_NGINX_WORKERS__" or grains['num_cpus'] }}
-    {%- if "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" != "" %}
+    {%- set max_reqs = "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" %}
+    {%- if max_reqs != "" and max_reqs is number %}
     # Default is 100
-    passenger_max_request_queue_size: __CONTROLLER_MAX_CONCURRENT_REQUESTS__
+    passenger_max_request_queue_size: {{ max_reqs + 5 }}
     {%- endif %}
 
   ### SERVER