diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2018-02-27 03:39:14 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-02-27 03:51:15 +0300 |
| commit | 6e9b3d1ba4ada577a370b7cdebfcf699aef07f65 (patch) | |
| tree | 0a7ade3a4d963195a4b6887720f04b075470602d | |
| parent | 631f822f7dd7688d437fa7324827c5ff795756d6 (diff) | |
| download | rabbitmq-server-git-6e9b3d1ba4ada577a370b7cdebfcf699aef07f65.tar.gz | |
Correct generated randomized startup delay range key
Closes #1531.
References rabbitmq/rabbitmq-peer-discovery-aws#17.
[#155538515]
(cherry picked from commit a92f15030b7a5c8fd70fa4eb1da64ef23cc8f575)
| -rw-r--r-- | priv/schema/rabbit.schema | 6 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 6 |
2 files changed, 6 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/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}} ]}]}], []}, |