merge from bug 24227

And fix the two conflicts that appeared since the last merge.

1 files changed, 11 insertions, 3 deletions

diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 16bdc7f9c5..fd5f84f188 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -85,7 +85,9 @@ status() ->
                  no -> case all_clustered_nodes() of
                            [] -> [];
                            Nodes -> [{unknown, Nodes}]
-                       end
+                       end;
+                 Reason when Reason =:= starting; Reason =:= stopping ->
+                     exit({rabbit_busy, try_again_later})
              end},
      {running_nodes, running_clustered_nodes()}].
 
@@ -331,13 +333,19 @@ ensure_mnesia_dir() ->
 ensure_mnesia_running() ->
     case mnesia:system_info(is_running) of
         yes -> ok;
-        no  -> throw({error, mnesia_not_running})
+        starting -> wait_for(mnesia_running),
+                    ensure_mnesia_running();
+        Reason when Reason =:= no; Reason =:= stopping ->
+                    throw({error, mnesia_not_running})
     end.
 
 ensure_mnesia_not_running() ->
     case mnesia:system_info(is_running) of
         no  -> ok;
-        yes -> throw({error, mnesia_unexpectedly_running})
+        stopping -> wait_for(mnesia_not_running),
+                    ensure_mnesia_not_running();
+        Reason when Reason =:= yes; Reason =:= starting ->
+            throw({error, mnesia_unexpectedly_running})
     end.
 
 wait_for(Condition) ->