yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue#814 - Cannot remove a 'DOWN' node from the cluster

This commit is contained in:
Feng Lee 2016-12-12 19:25:49 +08:00
parent fa99cdcaa5
commit ed730f6827
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -1,4 +1,4 @@
{deps, [ {deps, [
{gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{gen_logger,".*",{git,"https://github.com/emqtt/gen_logger",""}},{esockd,".*",{git,"https://github.com/emqtt/esockd","emq20"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}} {gproc,".*",{git,"https://github.com/uwiger/gproc",""}},{lager,".*",{git,"https://github.com/basho/lager","master"}},{gen_logger,".*",{git,"https://github.com/emqtt/gen_logger",""}},{esockd,".*",{git,"https://github.com/emqtt/esockd","master"}},{mochiweb,".*",{git,"https://github.com/emqtt/mochiweb",""}}
]}. ]}.
{erl_opts, [{parse_transform,lager_transform}]}. {erl_opts, [{parse_transform,lager_transform}]}.

6
src/emqttd_cluster.erl
View File

@ -77,8 +77,10 @@ remove(Node) ->
ok -> rpc:call(Node, ?MODULE, reboot, []); ok -> rpc:call(Node, ?MODULE, reboot, []);
Error -> Error Error -> Error
end; end;
Error -> {badrpc, nodedown} ->
{error, Error} emqttd_mnesia:remove_from_cluster(Node);
{badrpc, Reason} ->
{error, Reason}
end. end.
%% @doc Cluster status %% @doc Cluster status

4
src/emqttd_mnesia.erl
View File

@ -187,8 +187,8 @@ remove_from_cluster(Node) when Node =/= node() ->
ensure_ok(del_schema_copy(Node)), ensure_ok(del_schema_copy(Node)),
ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); ensure_ok(rpc:call(Node, ?MODULE, delete_schema, []));
{true, false} -> {true, false} ->
ensure_ok(del_schema_copy(Node)), ensure_ok(del_schema_copy(Node));
ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); %ensure_ok(rpc:call(Node, ?MODULE, delete_schema, []));
{false, _} -> {false, _} ->
{error, node_not_in_cluster} {error, node_not_in_cluster}
end. end.