From 65393f3e8c6636734c32efc34cc33a7fbcac529e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 7 Aug 2023 16:28:13 -0400 Subject: [PATCH] 20680: Fix nginx_balancer_configuration & add note about defaults Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../multi_host/aws/pillars/nginx_balancer_configuration.sls | 2 +- .../config_examples/multi_host/aws/pillars/nginx_passenger.sls | 2 +- tools/salt-install/local.params.example.multiple_hosts | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_balancer_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_balancer_configuration.sls index f7e104f25c..b2b4db145c 100644 --- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_balancer_configuration.sls +++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_balancer_configuration.sls @@ -11,7 +11,7 @@ {%- if disabled_controller != "" %} {%- set controller_nr = controller_nr - 1 %} {%- endif %} -{%- set max_reqs = "__CONTROLLER_MAX_CONCURRENT_REQUESTS__" %} +{%- set max_reqs = ("__CONTROLLER_MAX_QUEUED_REQUESTS__" or 128)|int %} ### NGINX nginx: 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 47c79afc4f..ce8f0ff407 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 @@ -13,7 +13,7 @@ if grains.osfinger in ('CentOS Linux-7', 'Ubuntu-18.04', 'Debian-10') else '/usr/bin/ruby' %} {%- set max_workers = ("__CONTROLLER_MAX_WORKERS__" or grains['num_cpus'])|int %} -{%- set max_reqs = ("__CONTROLLER_MAX_QUEUED_REQUESTS__" or 1024)|int %} +{%- set max_reqs = ("__CONTROLLER_MAX_QUEUED_REQUESTS__" or 128)|int %} ### NGINX nginx: diff --git a/tools/salt-install/local.params.example.multiple_hosts b/tools/salt-install/local.params.example.multiple_hosts index 12da2e3ed6..ff31826dd6 100644 --- a/tools/salt-install/local.params.example.multiple_hosts +++ b/tools/salt-install/local.params.example.multiple_hosts @@ -139,7 +139,8 @@ SHELL_INT_IP=10.1.2.17 # be upgraded. DISABLED_CONTROLLER="" -# Performance tuning parameters +# Performance tuning parameters. If these are not set, workers +# defaults on the number of cpus and queued requests defaults to 128. #CONTROLLER_MAX_WORKERS= #CONTROLLER_MAX_QUEUED_REQUESTS= -- 2.30.2