Only attempt upgrade if we are *really* not clustered.

1 files changed, 4 insertions, 4 deletions

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