From 08558ece2b6bad28fd7c9e5a7bf6702291ca9052 Mon Sep 17 00:00:00 2001 From: Frank Ederveen Date: Fri, 23 Dec 2022 14:44:38 +0000 Subject: [PATCH] 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 (cherry picked from commit 07701912cfe5b4e72d0f63ce0a8782c3f8c3da7e) Conflicts: src/pybind/mgr/cephadm/tests/test_services.py --- .../templates/services/ingress/haproxy.cfg.j2 | 4 ++-- src/pybind/mgr/cephadm/tests/test_services.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) 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 025f081f9e1e..6d64c6363458 100644 --- 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 8f1bc338ba1a..3a64541b0916 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -1033,8 +1033,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 ' @@ -1155,8 +1155,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 ' @@ -1281,8 +1281,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 ' -- 2.47.3