diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2020-04-03 21:26:01 +0000 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2020-04-03 21:26:01 +0000 |
| commit | 3407e3a73dcfd077f91355d2ebac3d299b7b367a (patch) | |
| tree | 98b2b496116455537a042a065546dbe97cd5c98e /src | |
| parent | ee4b615fa84a5969aabcef1f7a2c7cc50a9f73ba (diff) | |
| download | rabbitmq-server-git-3407e3a73dcfd077f91355d2ebac3d299b7b367a.tar.gz | |
Ensure randomized_startup_delay_range custom value is used
This ensure the test completes within the 90sec time limit
https://pivotal.slack.com/archives/C055BSG8E/p1585840790221000
https://github.com/rabbitmq/rabbitmq-server/commit/609501c46d7e18a7ea103bfa0188e73c3c4fc951#commitcomment-38268475
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_peer_discovery.erl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/rabbit_peer_discovery.erl b/src/rabbit_peer_discovery.erl index 2f6d7e8420..c2860f3b24 100644 --- a/src/rabbit_peer_discovery.erl +++ b/src/rabbit_peer_discovery.erl @@ -29,16 +29,22 @@ lock_acquisition_failure_mode/0]). -define(DEFAULT_BACKEND, rabbit_peer_discovery_classic_config). + %% what node type is used by default for this node when joining %% a new cluster as a virgin node -define(DEFAULT_NODE_TYPE, disc). + %% default node prefix to attach to discovered hostnames -define(DEFAULT_PREFIX, "rabbit"). + %% default randomized delay range, in seconds -define(DEFAULT_STARTUP_RANDOMIZED_DELAY, {5, 60}). --define(NODENAME_PART_SEPARATOR, "@"). +%% default discovery retries and interval. +-define(DEFAULT_DISCOVERY_RETRY_COUNT, 10). +-define(DEFAULT_DISCOVERY_RETRY_INTERVAL_MS, 500). +-define(NODENAME_PART_SEPARATOR, "@"). -spec backend() -> atom(). @@ -155,11 +161,11 @@ maybe_unregister() -> discovery_retries() -> case application:get_env(rabbit, cluster_formation) of {ok, Proplist} -> - Retries = proplists:get_value(discovery_retry_limit, Proplist, 10), - Interval = proplists:get_value(discovery_retry_interval, Proplist, 500), + Retries = proplists:get_value(discovery_retry_limit, Proplist, ?DEFAULT_DISCOVERY_RETRY_COUNT), + Interval = proplists:get_value(discovery_retry_interval, Proplist, ?DEFAULT_DISCOVERY_RETRY_INTERVAL_MS), {Retries, Interval}; undefined -> - {10, 500} + {?DEFAULT_DISCOVERY_RETRY_COUNT, ?DEFAULT_DISCOVERY_RETRY_INTERVAL_MS} end. |