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
rabbitmq · Aug 19, 2024 · 6342f66 · 6342f66
1 parent 72459e6
commit 6342f66
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 38 deletions.
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
@@ -1352,28 +1352,6 @@ fun(Conf) ->
     end
 end}.
 
-%% Cluster formation: Randomized startup delay
-%%
-%% DEPRECATED: This is a no-op. Old configs are still allowed, but a warning will be printed.
-
-{mapping, "cluster_formation.randomized_startup_delay_range.min", "rabbit.cluster_formation.randomized_startup_delay_range", []}.
-{mapping, "cluster_formation.randomized_startup_delay_range.max", "rabbit.cluster_formation.randomized_startup_delay_range", []}.
-
-{translation, "rabbit.cluster_formation.randomized_startup_delay_range",
-fun(Conf) ->
-    Min = cuttlefish:conf_get("cluster_formation.randomized_startup_delay_range.min", Conf, undefined),
-    Max = cuttlefish:conf_get("cluster_formation.randomized_startup_delay_range.max", Conf, undefined),
-
-    case {Min, Max} of
-      {undefined, undefined} ->
-        ok;
-      _ ->
-        cuttlefish:warn("cluster_formation.randomized_startup_delay_range.min and "
-                               "cluster_formation.randomized_startup_delay_range.max are deprecated")
-    end,
-    cuttlefish:unset()
-end}.
-
 %% Cluster formation: lock acquisition retries as passed to https://erlang.org/doc/man/global.html#set_lock-3
 %%
 %% Currently used in classic, k8s, and aws peer discovery backends.

diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
@@ -770,22 +770,6 @@ tcp_listen_options.exit_on_close = false",
   [{rabbit,[{tcp_listen_options,[{linger,{false,100}}]}]}],
   []},
 
- {cluster_formation_randomized_startup_delay_both_values,
-  "cluster_formation.randomized_startup_delay_range.min = 10
-   cluster_formation.randomized_startup_delay_range.max = 30",
-  [],
-  []},
-
- {cluster_formation_randomized_startup_delay_min_only,
-  "cluster_formation.randomized_startup_delay_range.min = 10",
-  [],
-  []},
-
- {cluster_formation_randomized_startup_delay_max_only,
-  "cluster_formation.randomized_startup_delay_range.max = 30",
-  [],
-  []},
-
  {cluster_formation_internal_lock_retries,
   "cluster_formation.internal_lock_retries = 10",
   [{rabbit,[{cluster_formation,[{internal_lock_retries,10}]}]}],