add timeout config for HAProxy

Author: rwinieski

README.md

@@ -207,6 +207,9 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
 | `haproxy.additionalAppServers`                      | List of additional HTTP Ports configuration for HAproxy                         | `[]`                     |
 | `haproxy.tcpports.enabled`                          | Parameter to enable TCP port routing on HAProxy                              | `false`                  |
 | `haproxy.tcpports`                                  | TCP Ports and load balancing type configuration for HAproxy                  | `[]`                     |
+| `haproxy.timemout.client`                           | Timeout client measures inactivity during periods that we would expect the client to be speaking  | `600s`  |
+| `haproxy.timeout.connect`                           | Timeout connect configures the time that HAProxy will wait for a TCP connection to a backend server to be established  | `600s`  |
+| `haproxy.timeout.server`                            | Timeout server measures inactivity when we’d expect the backend server to be speaking | `600s`  |
 | `haproxy.tls.enabled`                               | Parameter to enable TLS for HAProxy                                                                                                                                                    | `false`                    |
 | `haproxy.tls.secretName`                            | Name of the secret that stores the certificate                                                                                                                                         | `""`                       |
 | `haproxy.tls.certFileName`                          | The name of the certificate file in the secret                                                                                                                                         | `""`                       |

charts/charts/haproxy/values.yaml

@@ -104,6 +104,13 @@ tcpports:
   #     type: TCP
   #     port: 5432
 
+# Timeout configuration for HAProxy
+# See Ref: https://www.haproxy.com/blog/the-four-essential-sections-of-an-haproxy-configuration#timeout-connect-timeout-client-timeout-server
+  timeout:
+    client: 600s
+    connect: 600s
+    server: 600s
+
 ## Automatically Roll Deployments
 # ref: https://helm.sh/docs/howto/charts_tips_and_tricks/#automatically-roll-deployments
 checksumConfigMap:

charts/templates/configmap-haproxy.yaml

@@ -26,9 +26,9 @@ data:
     defaults
       log global
       option forwardfor
-      timeout client 600s
-      timeout connect 600s
-      timeout server 600s
+      timeout client {{ .Values.haproxy.timeout.client }}
+      timeout connect {{ .Values.haproxy.timeout.connect }}
+      timeout server {{ .Values.haproxy.timeout.server }}
 
     resolvers dns
       # add nameserver from /etc/resolv.conf

charts/values.yaml

@@ -420,6 +420,14 @@ haproxy:
     #     type: TCP
     #     port: 5432
 
+
+  # Timeout configuration for HAProxy. It is recommended to set the same timeout on HAproxy as it is on MarkLogic App-Server (default to 600 second).
+  # ref: https://www.haproxy.com/blog/the-four-essential-sections-of-an-haproxy-configuration#timeout-connect-timeout-client-timeout-server
+  timeout:
+    client: 600s
+    connect: 600s
+    server: 600s
+
   ## Configure TLS for HAProxy
   ## Put the PEM-formatted SSL certificate into a secret and provide the secret name in the secretName field.
   ## The PEM-formatted SSL certificate should contain the private key and the certificate. For example: cat certificate.pem private-key.pem > mycert.pem