Skip to content

Commit cdc3470

Browse files
committed
Remove randomized_startup_delay_range config
For RabbitMQ 4.0, this commit removes support for the deprecated `rabbitmq.conf` settings ``` cluster_formation.randomized_startup_delay_range.min cluster_formation.randomized_startup_delay_range.max ``` The rabbitmq/cluster-operator already removed these settings in rabbitmq/cluster-operator@b81e0f9 (cherry picked from commit b105ca9)
1 parent 0184aa9 commit cdc3470

File tree

3 files changed

+9
-38
lines changed

3 files changed

+9
-38
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,28 +1352,6 @@ fun(Conf) ->
13521352
end
13531353
end}.
13541354

1355-
%% Cluster formation: Randomized startup delay
1356-
%%
1357-
%% DEPRECATED: This is a no-op. Old configs are still allowed, but a warning will be printed.
1358-
1359-
{mapping, "cluster_formation.randomized_startup_delay_range.min", "rabbit.cluster_formation.randomized_startup_delay_range", []}.
1360-
{mapping, "cluster_formation.randomized_startup_delay_range.max", "rabbit.cluster_formation.randomized_startup_delay_range", []}.
1361-
1362-
{translation, "rabbit.cluster_formation.randomized_startup_delay_range",
1363-
fun(Conf) ->
1364-
Min = cuttlefish:conf_get("cluster_formation.randomized_startup_delay_range.min", Conf, undefined),
1365-
Max = cuttlefish:conf_get("cluster_formation.randomized_startup_delay_range.max", Conf, undefined),
1366-
1367-
case {Min, Max} of
1368-
{undefined, undefined} ->
1369-
ok;
1370-
_ ->
1371-
cuttlefish:warn("cluster_formation.randomized_startup_delay_range.min and "
1372-
"cluster_formation.randomized_startup_delay_range.max are deprecated")
1373-
end,
1374-
cuttlefish:unset()
1375-
end}.
1376-
13771355
%% Cluster formation: lock acquisition retries as passed to https://erlang.org/doc/man/global.html#set_lock-3
13781356
%%
13791357
%% Currently used in classic, k8s, and aws peer discovery backends.

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -770,22 +770,6 @@ tcp_listen_options.exit_on_close = false",
770770
[{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
771771
[]},
772772

773-
{cluster_formation_randomized_startup_delay_both_values,
774-
"cluster_formation.randomized_startup_delay_range.min = 10
775-
cluster_formation.randomized_startup_delay_range.max = 30",
776-
[],
777-
[]},
778-
779-
{cluster_formation_randomized_startup_delay_min_only,
780-
"cluster_formation.randomized_startup_delay_range.min = 10",
781-
[],
782-
[]},
783-
784-
{cluster_formation_randomized_startup_delay_max_only,
785-
"cluster_formation.randomized_startup_delay_range.max = 30",
786-
[],
787-
[]},
788-
789773
{cluster_formation_internal_lock_retries,
790774
"cluster_formation.internal_lock_retries = 10",
791775
[{rabbit,[{cluster_formation,[{internal_lock_retries,10}]}]}],

release-notes/4.0.0.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,15 @@ classic_queue.default_version = 1
6262
nodes will now fail to start. Removing the line will make the node start and perform
6363
the migration from CQv1 to CQv2.
6464

65+
### Settings `cluster_formation.randomized_startup_delay_range.*` were Removed
66+
67+
The following two deprecated `rabbitmq.conf` settings were [removed](https://github.com/rabbitmq/rabbitmq-server/pull/12050):
68+
```
69+
cluster_formation.randomized_startup_delay_range.min
70+
cluster_formation.randomized_startup_delay_range.max
71+
```
72+
RabbitMQ 4.0 will fail to boot if these settings are configured in `rabbitmq.conf`.
73+
6574
### Several Disk I/O-Related Metrics were Removed
6675

6776
Several I/O-related metrics are dropped, they should be [monitored at the infrastructure and kernel layers](https://www.rabbitmq.com/docs/monitoring#system-metrics)

0 commit comments

Comments
 (0)