Increase HAP server timeout

Various gate jobs have failed with 504 timeouts. This patch makes the
hap client and server timeouts configurable in the user config so that
they can be raised in the gate.

closes-bug: #1402580

Change-Id: Ia9663eafd7934a76a1839a40a5e250eefdc2085e
This commit is contained in:
Hugh Saunders 2014-12-10 08:09:44 +00:00
parent f91bee9951
commit eaf2e2a72b
2 changed files with 7 additions and 2 deletions

View File

@ -165,3 +165,8 @@ swift_allow_all_users: False
# The dispersion user is for swift-dispersion-report # The dispersion user is for swift-dispersion-report
swift_dispersion_user: dispersion swift_dispersion_user: dispersion
swift_dispersion_password: swift_dispersion_password:
# This variables is used to set haproxy's timeout client and timeout server
# values, they are set in the main config file and are only used by services
# that don't set their own values (default: 90)
#haproxy_timeout: 90

View File

@ -14,9 +14,9 @@ defaults
option dontlognull option dontlognull
option redispatch option redispatch
retries 3 retries 3
timeout client 50s timeout client {{ haproxy_timeout|default(90) }}
timeout connect 10s timeout connect 10s
timeout server 50s timeout server {{ haproxy_timeout|default(90) }}
maxconn 4096 maxconn 4096
errorfile 400 /etc/haproxy/errors/400.http errorfile 400 /etc/haproxy/errors/400.http
errorfile 403 /etc/haproxy/errors/403.http errorfile 403 /etc/haproxy/errors/403.http