openstack
/
tripleo-image-elements
Code Issues Proposed changes

Make haproxy timeout configurable 

We are hitting haproxy server timeouts sometimes so making
these values configurable so that we can tune them via heat.

Change-Id: I83d219e076229fe58eec13ad99432c4770accc8d
This commit is contained in:
Michael Kerrin 2014-09-16 09:01:30 +01:00
parent ccb5f1450d
commit 134fa7d65b
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elements/haproxy/README.md
View File

@ -19,6 +19,18 @@ The following properties are supported for configuring haproxy
* haproxy.service_maxconn: A limit on the number of the number of concurrent
connections that are allowed to each proxied service. This is a default value
that can be overridden in an individual haproxy.service section.
* haproxy.timeout.http-request: Set the maximum default allowed time to wait
for a complete HTTP request.
* haproxy.timeout.queue: Set the maximum default time to wait in the queue for
a connection slot to be free.
* haproxy.timeout.connect: Set the maximum default time to wait for a
connection attempt to a server to succeed.
* haproxy.timeout.client: Set the maximum default inactivity time on the client
side.
* haproxy.timeout.server: Set the maximum default inactivity time on the server
side.
* haproxy.timeout.check: Set additional check timeout, but only after a
connection has been already established.
Each haproxy.services can define the following sub-properties

30
elements/haproxy/os-apply-config/etc/haproxy/haproxy.cfg
View File

@ -10,12 +10,42 @@ defaults
log global
maxconn {{#haproxy.service_maxconn}}{{.}}{{/haproxy.service_maxconn}}{{^haproxy.service_maxconn}}150{{/haproxy.service_maxconn}}
retries 3
{{#haproxy.timeout.http-request}}
timeout http-request {{{.}}}
{{/haproxy.timeout.http-request}}
{{^haproxy.timeout.http-request}}
timeout http-request 10s
{{/haproxy.timeout.http-request}}
{{#haproxy.timeout.queue}}
timeout queue {{{.}}}
{{/haproxy.timeout.queue}}
{{^haproxy.timeout.queue}}
timeout queue 1m
{{/haproxy.timeout.queue}}
{{#haproxy.timeout.connect}}
timeout connect {{{.}}}
{{/haproxy.timeout.connect}}
{{^haproxy.timeout.connect}}
timeout connect 10s
{{/haproxy.timeout.connect}}
{{#haproxy.timeout.client}}
timeout client {{{.}}}
{{/haproxy.timeout.client}}
{{^haproxy.timeout.client}}
timeout client 1m
{{/haproxy.timeout.client}}
{{#haproxy.timeout.server}}
timeout server {{{.}}}
{{/haproxy.timeout.server}}
{{^haproxy.timeout.server}}
timeout server 1m
{{/haproxy.timeout.server}}
{{#haproxy.timeout.check}}
timeout check {{{.}}}
{{/haproxy.timeout.check}}
{{^haproxy.timeout.check}}
timeout check 10s
{{/haproxy.timeout.check}}
mode tcp
option tcpka
option tcplog