Merge pull request #1532 from rabbitmq/rabbitmq-server-1531-master

Correct generated randomized startup delay range key (master)

Author: michaelklishin

priv/schema/rabbit.schema

@@ -869,12 +869,12 @@ end}.
 
 %% Cluster formation: Randomized startup delay
 
-{mapping, "cluster_formation.randomized_startup_delay_range.min", "rabbit.cluster_formation.randomized_delay_range",
+{mapping, "cluster_formation.randomized_startup_delay_range.min", "rabbit.cluster_formation.randomized_startup_delay_range",
     [{datatype, integer}]}.
-{mapping, "cluster_formation.randomized_startup_delay_range.max", "rabbit.cluster_formation.randomized_delay_range",
+{mapping, "cluster_formation.randomized_startup_delay_range.max", "rabbit.cluster_formation.randomized_startup_delay_range",
     [{datatype, integer}]}.
 
-{translation, "rabbit.cluster_formation.randomized_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),

src/rabbit_mnesia.erl

@@ -138,6 +138,7 @@ init_with_lock(0, _, InitFromConfig) ->
 init_with_lock(Retries, Timeout, InitFromConfig) ->
     case rabbit_peer_discovery:lock() of
         not_supported ->
+            rabbit_log:info("Peer discovery backend does not support locking, falling back to randomized delay"),
             %% See rabbitmq/rabbitmq-server#1202 for details.
             rabbit_peer_discovery:maybe_inject_randomized_delay(),
             InitFromConfig(),

test/config_schema_SUITE_data/rabbit.snippets

@@ -405,21 +405,21 @@ tcp_listen_options.exit_on_close = false",
   "cluster_formation.randomized_startup_delay_range.min = 10
    cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
-                                  {randomized_delay_range, {10, 30}}
+                                  {randomized_startup_delay_range, {10, 30}}
                                   ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_min_only,
   "cluster_formation.randomized_startup_delay_range.min = 10",
   [{rabbit, [{cluster_formation, [
-                                  {randomized_delay_range, {10, 60}}
+                                  {randomized_startup_delay_range, {10, 60}}
                                   ]}]}],
   []},
 
  {cluster_formation_randomized_startup_delay_max_only,
   "cluster_formation.randomized_startup_delay_range.max = 30",
   [{rabbit, [{cluster_formation, [
-                                  {randomized_delay_range, {5, 30}}
+                                  {randomized_startup_delay_range, {5, 30}}
                                   ]}]}],
   []},