diff options
| author | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-07-04 16:33:22 +0100 |
|---|---|---|
| committer | Francesco Mazzoli <francesco@rabbitmq.com> | 2012-07-04 16:33:22 +0100 |
| commit | 10a91e93d2733347251c5b3bf6968696f305bd6d (patch) | |
| tree | b1b0045df4f317fe5bf9413416c94d4c9083ae92 /src | |
| parent | b426c28811de4813dc9d3b34bda046dd794d485d (diff) | |
| download | rabbitmq-server-git-10a91e93d2733347251c5b3bf6968696f305bd6d.tar.gz | |
check if only disc node after `init_db' in `reset/1'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 970495929f..9ef2f30213 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -199,15 +199,6 @@ reset(Force) -> true -> "" end]), ensure_mnesia_not_running(), - case not Force andalso is_disc_and_clustered() andalso - is_only_disc_node(node()) - of - true -> throw({error, {standalone_ram_node, - "You can't reset a node if it's the only disc " - "node in a cluster. Please convert another node" - " of the cluster to a disc node first."}}); - false -> ok - end, Node = node(), case Force of true -> @@ -219,6 +210,14 @@ reset(Force) -> %% Force=true here so that reset still works when clustered with a %% node which is down. init_db_with_mnesia(AllNodes, is_disc_node(), false, true), + case is_disc_and_clustered() andalso is_only_disc_node(node()) of + true -> throw({error, {standalone_ram_node, + "You can't reset a node if it's the " + "only disc node in a cluster. Please " + "convert another node of the cluster " + "to a disc node first."}}); + false -> ok + end, leave_cluster(), rabbit_misc:ensure_ok(mnesia:delete_schema([Node]), cannot_delete_schema), @@ -642,7 +641,7 @@ check_cluster_consistency() -> lists:foldl( fun(Node, {error, Error}) -> case rpc:call(Node, rabbit_mnesia, node_info, []) of - {badrpc, Reason} -> + {badrpc, _Reason} -> {error, Error}; {OTP, Rabbit, Res} -> rabbit_misc:sequence_error( |