From 00b52d10b1e1f085fea38ba84303f9f07cc7ad5d Mon Sep 17 00:00:00 2001
From: David Ames <david.ames@canonical.com>
Date: Mon, 11 Dec 2017 11:37:06 -0800
Subject: [PATCH] Update HAProxy default timeout values

The default HAProxy timeout values are fairly strict. On a busy cloud
it is common to exceed one or more of these timeouts. The only
indication that HAProxy has exceeded a timeout and dropped the
connection is errors such as "BadStatusLine" or "EOF." These can be
very difficult to diagnose when intermittent.

This charm-helpers sync pulls in the change to update the default
timeout values to more real world settings. These values have been
extensively tested in ServerStack. Configured values will not be
overridden.

Partial Bug: #1736171

Change-Id: I6651ecdb89af11e94c59f928c1eb4a89940f4679
---
 config.yaml                                               | 8 ++++----
 .../charmhelpers/contrib/openstack/templates/haproxy.cfg  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config.yaml b/config.yaml
index a0faad01..526811c2 100755
--- a/config.yaml
+++ b/config.yaml
@@ -197,25 +197,25 @@ options:
     default:
     description: |
       Server timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 30000ms is used.
+      configurations. If not provided, default value of 90000ms is used.
   haproxy-client-timeout:
     type: int
     default:
     description: |
       Client timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 30000ms is used.
+      configurations. If not provided, default value of 90000ms is used.
   haproxy-queue-timeout:
     type: int
     default:
     description: |
       Queue timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 5000ms is used.
+      configurations. If not provided, default value of 9000ms is used.
   haproxy-connect-timeout:
     type: int
     default:
     description: |
       Connect timeout configuration in ms for haproxy, used in HA
-      configurations. If not provided, default value of 5000ms is used.
+      configurations. If not provided, default value of 9000ms is used.
   enable-sriov:
     type: boolean
     default: False
diff --git a/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg b/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
index ebc8a68a..d36af2aa 100644
--- a/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
+++ b/hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg
@@ -17,22 +17,22 @@ defaults
 {%- if haproxy_queue_timeout %}
     timeout queue {{ haproxy_queue_timeout }}
 {%- else %}
-    timeout queue 5000
+    timeout queue 9000
 {%- endif %}
 {%- if haproxy_connect_timeout %}
     timeout connect {{ haproxy_connect_timeout }}
 {%- else %}
-    timeout connect 5000
+    timeout connect 9000
 {%- endif %}
 {%- if haproxy_client_timeout %}
     timeout client {{ haproxy_client_timeout }}
 {%- else %}
-    timeout client 30000
+    timeout client 90000
 {%- endif %}
 {%- if haproxy_server_timeout %}
     timeout server {{ haproxy_server_timeout }}
 {%- else %}
-    timeout server 30000
+    timeout server 90000
 {%- endif %}
 
 listen stats