Only attempt upgrade if we are not clustered. wait_for_tables() beforehand should thus be safe.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index cd072b9c..2555c2f0 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -378,7 +378,11 @@ init_db(ClusterNodes, Force) ->
                 [] ->
                     case mnesia:system_info(use_dir) of
                         true ->
-                            rabbit_upgrade:maybe_upgrade(dir()),
+                            case is_clustered() of
+                                false -> wait_for_tables(),
+                                         rabbit_upgrade:maybe_upgrade(dir());
+                                _     -> ok
+                            end,
                             case check_schema_integrity() of
                                 ok ->
                                     ok;