mgr/cephadm: increate ingress timeout values

This commit increases the 'timeout client' and 'timeout server' from 1s
to 30s. S3cmd multi-part uploads were failing with the shorter timeout.

Fixes: https://tracker.ceph.com/issues/58183
Signed-off-by: Frank Ederveen <frank.ederveen@gmail.com>
(cherry picked from commit 07701912cfe5b4e72d0f63ce0a8782c3f8c3da7e)

Conflicts:
	src/pybind/mgr/cephadm/tests/test_services.py

diff --git a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
index cb84f1d072226f3a55d37a62795d3dcd2d31884a..01db8a50a3c8f14faec63de857f2bb5063f3a663 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
+++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
@@ -32,8 +32,8 @@ defaults
     timeout connect         5s
     timeout http-request    1s
     timeout http-keep-alive 5s
-    timeout client          1s
-    timeout server          1s
+    timeout client          30s
+    timeout server          30s
     timeout check           5s
 {% endif %}
 {% if mode == 'tcp' %}

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index f7e03536dc19ed7bf5d28a7fafc6635980f54b48..1d4f4c6f22fd1769ed4e075233a92dc6aeb2f8a3 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -978,8 +978,8 @@ class TestIngressService:
                                 'timeout connect         5s\n    '
                                 'timeout http-request    1s\n    '
                                 'timeout http-keep-alive 5s\n    '
-                                'timeout client          1s\n    '
-                                'timeout server          1s\n    '
+                                'timeout client          30s\n    '
+                                'timeout server          30s\n    '
                                 'timeout check           5s\n    '
                                 'maxconn                 8000\n'
                                 '\nfrontend stats\n    '
@@ -1102,8 +1102,8 @@ class TestIngressService:
                                 'timeout connect         5s\n    '
                                 'timeout http-request    1s\n    '
                                 'timeout http-keep-alive 5s\n    '
-                                'timeout client          1s\n    '
-                                'timeout server          1s\n    '
+                                'timeout client          30s\n    '
+                                'timeout server          30s\n    '
                                 'timeout check           5s\n    '
                                 'maxconn                 8000\n'
                                 '\nfrontend stats\n    '