root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Added 'unlimited' config setting for peer_discovery_retry_limit

This commit is contained in:
Simon Unge 2025-04-02 18:34:32 +00:00
parent 5a9482dfef
commit b7c4f66a69
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/rabbit/priv/schema/rabbit.schema vendored
View File

@ -1401,10 +1401,19 @@ end}.
]}. ]}.
{mapping, "cluster_formation.discovery_retry_limit", "rabbit.cluster_formation.discovery_retry_limit", {mapping, "cluster_formation.discovery_retry_limit", "rabbit.cluster_formation.discovery_retry_limit",
[ [{datatype, [{atom, unlimited}, integer]}]}.
{datatype, integer},
{validators, ["non_zero_positive_integer"]} {translation, "rabbit.cluster_formation.discovery_retry_limit",
]}. fun(Conf) ->
case cuttlefish:conf_get("cluster_formation.discovery_retry_limit", Conf, undefined) of
undefined -> cuttlefish:unset();
unlimited -> unlimited;
Val when is_integer(Val) andalso Val > 0 -> Val;
_ -> cuttlefish:invalid("should be positive integer or 'unlimited'")
end
end
}.
{mapping, "cluster_formation.discovery_retry_interval", "rabbit.cluster_formation.discovery_retry_interval", {mapping, "cluster_formation.discovery_retry_interval", "rabbit.cluster_formation.discovery_retry_interval",
[ [
{datatype, integer}, {datatype, integer},

24
deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets vendored
View File

@ -274,7 +274,7 @@ cluster_formation.classic_config.nodes.peer2 = rabbit@hostname2",
[{peer_discovery_backend,rabbit_peer_discovery_classic_config}]}, [{peer_discovery_backend,rabbit_peer_discovery_classic_config}]},
{cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}], {cluster_nodes,{[rabbit@hostname2,rabbit@hostname1],disc}}]}],
[]}, []},
{cluster_formation_module_dns_alias, {cluster_formation_module_dns_alias,
"cluster_formation.peer_discovery_backend = dns "cluster_formation.peer_discovery_backend = dns
cluster_formation.dns.hostname = discovery.eng.example.local", cluster_formation.dns.hostname = discovery.eng.example.local",
@ -287,7 +287,7 @@ cluster_formation.dns.hostname = discovery.eng.example.local",
]}]} ]}]}
]}], ]}],
[]}, []},
{cluster_formation_disk, {cluster_formation_disk,
"cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config "cluster_formation.peer_discovery_backend = rabbit_peer_discovery_classic_config
cluster_formation.classic_config.nodes.peer1 = rabbit@hostname1 cluster_formation.classic_config.nodes.peer1 = rabbit@hostname1
@ -758,17 +758,17 @@ tcp_listen_options.exit_on_close = false",
{fail_if_no_peer_cert, false}, {fail_if_no_peer_cert, false},
{honor_ecc_order, true}]}]}], {honor_ecc_order, true}]}]}],
[]}, []},
{ssl_cert_login_from_cn, {ssl_cert_login_from_cn,
"ssl_cert_login_from = common_name", "ssl_cert_login_from = common_name",
[{rabbit,[{ssl_cert_login_from, common_name}]}], [{rabbit,[{ssl_cert_login_from, common_name}]}],
[]}, []},
{ssl_cert_login_from_dn, {ssl_cert_login_from_dn,
"ssl_cert_login_from = distinguished_name", "ssl_cert_login_from = distinguished_name",
[{rabbit,[{ssl_cert_login_from, distinguished_name}]}], [{rabbit,[{ssl_cert_login_from, distinguished_name}]}],
[]}, []},
{ssl_cert_login_from_san_dns, {ssl_cert_login_from_san_dns,
"ssl_cert_login_from = subject_alternative_name "ssl_cert_login_from = subject_alternative_name
ssl_cert_login_san_type = dns ssl_cert_login_san_type = dns
@ -779,7 +779,7 @@ tcp_listen_options.exit_on_close = false",
{ssl_cert_login_san_index, 0} {ssl_cert_login_san_index, 0}
]}], ]}],
[]}, []},
{ssl_options_bypass_pem_cache, {ssl_options_bypass_pem_cache,
"ssl_options.bypass_pem_cache = true", "ssl_options.bypass_pem_cache = true",
@ -838,6 +838,18 @@ tcp_listen_options.exit_on_close = false",
[{peer_discovery_backend,rabbit_peer_discovery_classic_config}, [{peer_discovery_backend,rabbit_peer_discovery_classic_config},
{node_type,ram}]}]}], {node_type,ram}]}]}],
[]}, []},
{cluster_formation_retry_limit_integer,
"cluster_formation.discovery_retry_limit = 500",
[{rabbit,
[{cluster_formation,
[{discovery_retry_limit, 500}]}]}],
[]},
{cluster_formation_retry_limit_infinity,
"cluster_formation.discovery_retry_limit = unlimited",
[{rabbit,
[{cluster_formation,
[{discovery_retry_limit, unlimited}]}]}],
[]},
{background_gc_enabled, {background_gc_enabled,
"background_gc_enabled = true "background_gc_enabled = true
background_gc_target_interval = 30000", background_gc_target_interval = 30000",