reset when turning disc into ram node

1 files changed, 9 insertions, 0 deletions

diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index dc27e58bdb..4d73113716 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -291,6 +291,15 @@ change_cluster_node_type(Type) ->
                          "disc nodes to the cluster first."}});
         false -> ok
     end,
+    %% This is an horrible hack due to
+    %% <http://erlang.org/pipermail/erlang-questions/2012-August/068696.html>.
+    %% This is safe if the cluster situation remains the same between the
+    %% cluster discovery and joining the cluster, but if for example the other
+    %% cluster nodes disappear in that timeframe we are in trouble.
+    ok = case is_disc_node() andalso not WantDiscNode of
+             true  -> reset(false);
+             false -> ok
+         end,
     ok = init_db_with_mnesia(AllNodes, WantDiscNode, false).
 
 update_cluster_nodes(DiscoveryNode) ->