summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2019-10-18 00:59:06 +0300
committerGitHub <noreply@github.com>2019-10-18 00:59:06 +0300
commita23ef3af615b804e3fa10f2a843c0d74336fe606 (patch)
treef1d18a89045fd553c5496aab64d271d1930df62f /src
parent57ff7b30929e094de17a72b000e18f7e6cf00baa (diff)
parentb182de2aabd65231753e9636a6ed3ba532633496 (diff)
downloadrabbitmq-server-git-a23ef3af615b804e3fa10f2a843c0d74336fe606.tar.gz
Merge pull request #2144 from rabbitmq/await_boot_finish_avoid_infinity_division
Handle infinity timeout when awaiting boot finish
Diffstat (limited to 'src')
-rw-r--r--src/rabbit.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c49c4b7e7a..6d4ff8b8c9 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -783,6 +783,10 @@ wait_for_boot_to_finish(Node) ->
wait_for_boot_to_finish(Node, PrintProgressReports) ->
wait_for_boot_to_finish(Node, PrintProgressReports, ?BOOT_FINISH_TIMEOUT).
+wait_for_boot_to_finish(Node, PrintProgressReports, infinity) ->
+ %% This assumes that 100K iterations is close enough to "infinity".
+ %% Now that's deep.
+ do_wait_for_boot_to_finish(Node, PrintProgressReports, 100000);
wait_for_boot_to_finish(Node, PrintProgressReports, Timeout) ->
Iterations = Timeout div ?BOOT_STATUS_CHECK_INTERVAL,
do_wait_for_boot_to_finish(Node, PrintProgressReports, Iterations).