From 423cac898131290d3189233491053004feadee9d Mon Sep 17 00:00:00 2001 From: Shweta Bhosale Date: Tue, 4 Nov 2025 19:24:27 +0530 Subject: [PATCH] mgr/cephadm: increase default backend health check interval for NFS Fixes: https://tracker.ceph.com/issues/73712 Signed-off-by: Shweta Bhosale Resolves: rhbz#2400121 --- src/pybind/mgr/cephadm/services/ingress.py | 2 +- .../mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 | 2 +- src/pybind/mgr/cephadm/tests/test_services.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/ingress.py b/src/pybind/mgr/cephadm/services/ingress.py index 33825e6ea59..54e435f739b 100644 --- a/src/pybind/mgr/cephadm/services/ingress.py +++ b/src/pybind/mgr/cephadm/services/ingress.py @@ -286,7 +286,7 @@ class IngressService(CephService): 'frontend_port': frontend_port, 'monitor_port': spec.monitor_port, 'default_server_opts': server_opts, - 'health_check_interval': spec.health_check_interval or '2s', + 'health_check_interval': spec.health_check_interval or ('30s' if backend_spec.service_type == 'nfs' else '2s'), 'v4v6_flag': v4v6_flag, 'qat_support': spec.haproxy_qat_support, 'monitor_ssl_file': monitor_ssl_file, 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 55cb1b4b69b..dcebc28441b 100644 --- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 +++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 @@ -122,6 +122,6 @@ backend backend {% endfor %} {% else %} {% for server in servers %} - server {{ server.name }} {{ server.ip }}:{{ server.port }} check + server {{ server.name }} {{ server.ip }}:{{ server.port }} check inter {{ health_check_interval }} {% endfor %} {% endif %} diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index b08b8e96acd..838ca73cc5d 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -2789,7 +2789,7 @@ class TestIngressService: ) if enable_haproxy_protocol: haproxy_txt += ' default-server send-proxy-v2\n' - haproxy_txt += ' server nfs.foo.0 192.168.122.111:12049 check\n' + haproxy_txt += ' server nfs.foo.0 192.168.122.111:12049 check inter 30s\n' haproxy_expected_conf = { 'files': {'haproxy.cfg': haproxy_txt} } @@ -3692,7 +3692,7 @@ class TestIngressService: ' stick on src\n' ' hash-type consistent\n' ' default-server send-proxy-v2\n' - ' server nfs.foo.0 192.168.122.111:12049 check\n' + ' server nfs.foo.0 192.168.122.111:12049 check inter 30s\n' ) haproxy_expected_conf = { 'files': {'haproxy.cfg': haproxy_txt} -- 2.47.3