diff options
| -rw-r--r-- | src/rabbit_mnesia.erl | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 5be23a88da..61b4054aa5 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -732,15 +732,14 @@ reset(Force) -> end]), ensure_mnesia_not_running(), case not Force andalso is_clustered() andalso - is_only_disc_node(node(), false) + is_only_disc_node(node(), false) of true -> log_both("no other disc nodes running"); false -> ok end, - Node = node(), case Force of true -> - ok; + disconnect_nodes(nodes()); false -> ensure_mnesia_dir(), start_mnesia(), @@ -749,24 +748,26 @@ reset(Force) -> %% Force=true here so that reset still works when clustered %% with a node which is down ok = init_db(read_cluster_nodes_config(), true), - {all_clustered_nodes() -- [Node], - running_clustered_nodes() -- [Node]} + {all_clustered_nodes() -- [node()], + running_clustered_nodes() -- [node()]} after stop_mnesia() end, leave_cluster(Nodes, RunningNodes), - rabbit_misc:ensure_ok(mnesia:delete_schema([Node]), - cannot_delete_schema) + rabbit_misc:ensure_ok(mnesia:delete_schema([node()]), + cannot_delete_schema), + disconnect_nodes(Nodes) end, - %% We need to make sure that we don't end up in a distributed - %% Erlang system with nodes while not being in an Mnesia cluster - %% with them. We don't handle that well. - [erlang:disconnect_node(N) || N <- nodes() -- [Node]], ok = delete_cluster_nodes_config(), %% remove persisted messages and any other garbage we find ok = rabbit_file:recursive_delete(filelib:wildcard(dir() ++ "/*")), ok. +%% We need to make sure that we don't end up in a distributed Erlang +%% system with nodes while not being in an Mnesia cluster with +%% them. We don't handle that well. +disconnect_nodes(Nodes) -> [erlang:disconnect_node(N) || N <- Nodes]. + leave_cluster([], _) -> ok; leave_cluster(Nodes, RunningNodes) -> %% find at least one running cluster node and instruct it to |