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

Merge pull request #1100 from emqtt/develop 

Remove from cluster, delete the node in extra_db_nodes
This commit is contained in:
huangdan 2017-06-13 21:35:07 +08:00 committed by GitHub
parent 8bc0d77df6 37b625aa57
commit 99bd9ba19b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_mnesia.erl
View File

@ -186,9 +186,11 @@ remove_from_cluster(Node) when Node =/= node() ->
case {is_node_in_cluster(Node), is_running_db_node(Node)} of case {is_node_in_cluster(Node), is_running_db_node(Node)} of
{true, true} -> {true, true} ->
ensure_ok(rpc:call(Node, ?MODULE, ensure_stopped, [])), ensure_ok(rpc:call(Node, ?MODULE, ensure_stopped, [])),
mnesia_lib:del(extra_db_nodes, 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} ->
mnesia_lib:del(extra_db_nodes, 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, []));
{false, _} -> {false, _} ->