From a5d5dd383dadcfd956f0ada1df22eb2957d232e9 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 --- .../mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 | 4 ++-- src/pybind/mgr/cephadm/tests/test_services.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 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 cb84f1d07222..01db8a50a3c8 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 f7e03536dc19..1d4f4c6f22fd 100644 --- 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 ' -- 2.47.3