From 6d0b1374be51ed0be3dd37fb50aab9a2d38c1908 Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 15 Jul 2024 11:26:10 -0400 Subject: [PATCH] mgr/cephadm: change balance in haproxy cfg to roundrobin in tcp mode This was recommended to better support large deployments that are trying to send lots of data per client and want multiple backend gateways serving each client Signed-off-by: Adam King --- .../mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 | 3 +-- src/pybind/mgr/cephadm/tests/test_services.py | 6 ++---- 2 files changed, 3 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 997620b369c..b9b52843768 100644 --- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 +++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 @@ -86,8 +86,7 @@ backend backend {% endif %} {% if mode == 'tcp' %} mode tcp - balance source - hash-type consistent + balance roundrobin {% if default_server_opts %} default-server {{ default_server_opts|join(" ") }} {% endif %} diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index c990129e769..cd1e98b0df2 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -2786,8 +2786,7 @@ class TestIngressService: ' default_backend backend\n\n' 'backend backend\n' ' mode tcp\n' - ' balance source\n' - ' hash-type consistent\n' + ' balance roundrobin\n' ) if enable_haproxy_protocol: haproxy_txt += ' default-server send-proxy-v2\n' @@ -3606,8 +3605,7 @@ class TestIngressService: ' default_backend backend\n\n' 'backend backend\n' ' mode tcp\n' - ' balance source\n' - ' hash-type consistent\n' + ' balance roundrobin\n' ' default-server send-proxy-v2\n' ' server nfs.foo.0 192.168.122.111:12049 check\n' ) -- 2.39.5