Merge remote-tracking branch 'origin/stable'

1 files changed, 24 insertions, 11 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 8e6c9ead26..bc71994169 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -471,7 +471,7 @@ stop() ->
         undefined -> ok;
         _         ->
             rabbit_log:info("RabbitMQ hasn't finished starting yet. Waiting for startup to finish before stopping..."),
-            await_startup(true)
+            wait_to_finish_booting()
     end,
     rabbit_log:info("RabbitMQ is asked to stop...~n", []),
     Apps = ?APPS ++ rabbit_plugins:active(),
@@ -641,19 +641,32 @@ handle_app_error(Term) ->
     end.
 
 await_startup() ->
-    await_startup(false).
+    case is_booting() of
+        true -> wait_to_finish_booting();
+        false ->
+            case is_running() of
+                true -> ok;
+                false -> wait_to_start_booting(),
+                         wait_to_finish_booting()
+            end
+    end.
+
+is_booting() ->
+    whereis(rabbit_boot) /= undefined.
+
+wait_to_start_booting() ->
+    case whereis(rabbit_boot) of
+        undefined -> timer:sleep(100),
+                     wait_to_start_booting();
+        _         -> ok
+    end.
 
-await_startup(HaveSeenRabbitBoot) ->
-    %% We don't take absence of rabbit_boot as evidence we've started,
-    %% since there's a small window before it is registered.
+wait_to_finish_booting() ->
     case whereis(rabbit_boot) of
-        undefined -> case HaveSeenRabbitBoot orelse is_running() of
-                         true  -> ok;
-                         false -> timer:sleep(100),
-                                  await_startup(false)
-                     end;
+        undefined -> true = is_running(),
+                     ok;
         _         -> timer:sleep(100),
-                     await_startup(true)
+                     wait_to_finish_booting()
     end.
 
 status() ->