openstack/charm-openstack-dashboard
Code Issues Proposed changes

Adjust haproxy timeout to intended values

Browse Source 
Many years ago change Ida7949113594b9b859ab7b4ba8b2bb440bab6e7d
attempted to change the timeouts of haproxy but did not succeed,
as deployments were still using the values from the charm's
templates/haproxy.cfg file, being effectively set to 30 seconds
and causing timeouts (see bug). Additionally, the description
of the config options became inaccurate, stating the default to
be a value that they were really not.

This patch addresses the timeout value discrepancy, adjusting
to the original change's intended values.

Closes-bug: #2045168
Change-Id: I83405727b4a116ec6f47b61211bf8ef3d2d9fbd6
(cherry picked from commit 09c5871160)
This commit is contained in:
Rodrigo Barbieri 2024-03-06 14:59:11 -03:00 committed by Rodrigo Barbieri
parent 45a86be78a
commit 2f430d15e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/haproxy.cfg
View File

@ -15,22 +15,22 @@ defaults
{%- if haproxy_queue_timeout %} {%- if haproxy_queue_timeout %}
timeout queue {{ haproxy_queue_timeout }} timeout queue {{ haproxy_queue_timeout }}
{%- else %} {%- else %}
timeout queue 5000 timeout queue 9000
{%- endif %} {%- endif %}
{%- if haproxy_connect_timeout %} {%- if haproxy_connect_timeout %}
timeout connect {{ haproxy_connect_timeout }} timeout connect {{ haproxy_connect_timeout }}
{%- else %} {%- else %}
timeout connect 5000 timeout connect 9000
{%- endif %} {%- endif %}
{%- if haproxy_client_timeout %} {%- if haproxy_client_timeout %}
timeout client {{ haproxy_client_timeout }} timeout client {{ haproxy_client_timeout }}
{%- else %} {%- else %}
timeout client 30000 timeout client 90000
{%- endif %} {%- endif %}
{%- if haproxy_server_timeout %} {%- if haproxy_server_timeout %}
timeout server {{ haproxy_server_timeout }} timeout server {{ haproxy_server_timeout }}
{%- else %} {%- else %}
timeout server 30000 timeout server 90000
{%- endif %} {%- endif %}
listen stats listen stats