diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-01-28 19:10:02 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2019-01-28 20:42:58 +0300 |
| commit | 44dabcf6c2bbfb79caaf83ac341bb3f2338be3be (patch) | |
| tree | ea17cf49e2ec0c22c4cc7df2121f76789a28575c /src | |
| parent | b0dd88351314cb4e0afca79cafa6bf315b42cbee (diff) | |
| download | rabbitmq-server-git-44dabcf6c2bbfb79caaf83ac341bb3f2338be3be.tar.gz | |
await_startup: use default timeouts in ms, naming
Per #1848 review.
Pair @gerhard.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 84d3a9a8cd..542c4b11c3 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -236,12 +236,11 @@ -define(ASYNC_THREADS_WARNING_THRESHOLD, 8). -%% 5 minutes --define(BOOT_START_TIMEOUT, 300). +%% 1 minute +-define(BOOT_START_TIMEOUT, 1 * 60 * 1000). %% 12 hours --define(BOOT_FINISH_TIMEOUT, 43200). -%% 100ms --define(BOOT_STATUS_SAMPLING_INTERVAL, 100). +-define(BOOT_FINISH_TIMEOUT, 12 * 60 * 60 * 1000). +-define(BOOT_STATUS_CHECK_INTERVAL, 100). %%---------------------------------------------------------------------------- @@ -736,7 +735,7 @@ wait_for_boot_to_start(Node) -> wait_for_boot_to_start(Node, ?BOOT_START_TIMEOUT). wait_for_boot_to_start(Node, Timeout) -> - Iterations = Timeout div ?BOOT_STATUS_SAMPLING_INTERVAL, + Iterations = Timeout div ?BOOT_STATUS_CHECK_INTERVAL, do_wait_for_boot_to_start(Node, Iterations). do_wait_for_boot_to_start(_Node, IterationsLeft) when IterationsLeft =< 0 -> @@ -744,7 +743,7 @@ do_wait_for_boot_to_start(_Node, IterationsLeft) when IterationsLeft =< 0 -> do_wait_for_boot_to_start(Node, IterationsLeft) -> case is_booting(Node) of false -> - timer:sleep(?BOOT_STATUS_SAMPLING_INTERVAL), + timer:sleep(?BOOT_STATUS_CHECK_INTERVAL), do_wait_for_boot_to_start(Node, IterationsLeft - 1); {badrpc, _} = Err -> Err; @@ -756,7 +755,7 @@ wait_for_boot_to_finish(Node) -> wait_for_boot_to_finish(Node, ?BOOT_FINISH_TIMEOUT). wait_for_boot_to_finish(Node, Timeout) -> - Iterations = Timeout div ?BOOT_STATUS_SAMPLING_INTERVAL, + Iterations = Timeout div ?BOOT_STATUS_CHECK_INTERVAL, do_wait_for_boot_to_finish(Node, Iterations). do_wait_for_boot_to_finish(_Node, IterationsLeft) when IterationsLeft =< 0 -> @@ -774,7 +773,13 @@ do_wait_for_boot_to_finish(Node, IterationsLeft) -> {badrpc, _} = Err -> Err; true -> - timer:sleep(?BOOT_STATUS_SAMPLING_INTERVAL), + case IterationsLeft rem 100 of + %% This will be printed on the CLI command end to illustrate some + %% progress. + 0 -> io:format("Still booting, will check again in 10 seconds...~n"); + _ -> ok + end, + timer:sleep(?BOOT_STATUS_CHECK_INTERVAL), do_wait_for_boot_to_finish(Node, IterationsLeft - 1) end. |