diff options
| author | Michael Klishin <michael@novemberain.com> | 2018-02-27 05:51:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 05:51:35 +0300 |
| commit | 13229c94a08e294c65cc1b0a88f18e4b4e2658f7 (patch) | |
| tree | 7ffd0dfc3a127b207132b7bf62e2524ddad9cd2d | |
| parent | c364f9e5539c5c1a9a89f2968e6100934171e076 (diff) | |
| parent | 92b1de6630d299415feb4fe863d5db0b06142e8d (diff) | |
| download | rabbitmq-server-git-13229c94a08e294c65cc1b0a88f18e4b4e2658f7.tar.gz | |
Merge pull request #1532 from rabbitmq/rabbitmq-server-1531-master
Correct generated randomized startup delay range key (master)
| -rw-r--r-- | priv/schema/rabbit.schema | 6 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 1 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index a8a36ad87d..359abeb117 100644 --- a/priv/schema/rabbit.schema +++ b/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), diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 10b6aef609..793d365bf0 100644 --- a/src/rabbit_mnesia.erl +++ b/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(), diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 12c2774501..e4dda9f368 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/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}} ]}]}], []}, |