[arvados] created: 2.6.0-192-ge8a6dc77f

[git repository hosting]

        at  e8a6dc77fdc28cb4df6a5b164b14f0f6549f2112 (commit)


commit e8a6dc77fdc28cb4df6a5b164b14f0f6549f2112
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date:   Mon May 22 18:13:53 2023 -0300

    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 at 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 ef5a91b27..51842b6e2 100644
--- 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 775ff80fe..bd1aacffa 100644
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--