summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mnesia.erl13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 75ad3dc8d9..0f9a6a7ac4 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -521,12 +521,13 @@ init_db(ClusterNodes, Force, SecondaryPostMnesiaFun) ->
ProperClusterNodes = UClusterNodes -- [node()],
case mnesia:change_config(extra_db_nodes, ProperClusterNodes) of
{ok, Nodes} ->
- case {Nodes, Force} of
- {[], false} -> throw({error, {failed_to_cluster_with,
- ProperClusterNodes,
- "Mnesia could not connect "
- "to any disc nodes."}});
- _ -> ok
+ case {ProperClusterNodes, Nodes, Force} of
+ {[], [], false} -> ok;
+ {_, [], false} -> throw({error, {failed_to_cluster_with,
+ ProperClusterNodes,
+ "Mnesia could not connect "
+ "to any disc nodes."}});
+ _ -> ok
end,
WasDiscNode = is_disc_node(),
WantDiscNode = should_be_disc_node(ClusterNodes),