From 88d466eb1a299294f4aa35db692be77231c07094 Mon Sep 17 00:00:00 2001 From: turtled Date: Tue, 13 Jun 2017 21:02:38 +0800 Subject: [PATCH 1/2] remove from cluster, delete the node in extra_db_nodes --- src/emqttd_mnesia.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/emqttd_mnesia.erl b/src/emqttd_mnesia.erl index d8e0f88af..9c713cdd6 100644 --- a/src/emqttd_mnesia.erl +++ b/src/emqttd_mnesia.erl @@ -187,9 +187,11 @@ remove_from_cluster(Node) when Node =/= node() -> {true, true} -> ensure_ok(rpc:call(Node, ?MODULE, ensure_stopped, [])), ensure_ok(del_schema_copy(Node)), - ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); + ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])), + mnesia_lib:del(extra_db_nodes, Node); {true, false} -> - ensure_ok(del_schema_copy(Node)); + ensure_ok(del_schema_copy(Node)), + mnesia_lib:del(extra_db_nodes, Node); %ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); {false, _} -> {error, node_not_in_cluster} From 37b625aa575a2b377e5e032a096c1a67cb14ef59 Mon Sep 17 00:00:00 2001 From: turtled Date: Tue, 13 Jun 2017 21:13:57 +0800 Subject: [PATCH 2/2] Format code --- src/emqttd_mnesia.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emqttd_mnesia.erl b/src/emqttd_mnesia.erl index 9c713cdd6..20c054ab2 100644 --- a/src/emqttd_mnesia.erl +++ b/src/emqttd_mnesia.erl @@ -186,12 +186,12 @@ remove_from_cluster(Node) when Node =/= node() -> case {is_node_in_cluster(Node), is_running_db_node(Node)} of {true, true} -> ensure_ok(rpc:call(Node, ?MODULE, ensure_stopped, [])), + mnesia_lib:del(extra_db_nodes, Node), ensure_ok(del_schema_copy(Node)), - ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])), - mnesia_lib:del(extra_db_nodes, Node); + ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); {true, false} -> - ensure_ok(del_schema_copy(Node)), - mnesia_lib:del(extra_db_nodes, Node); + mnesia_lib:del(extra_db_nodes, Node), + ensure_ok(del_schema_copy(Node)); %ensure_ok(rpc:call(Node, ?MODULE, delete_schema, [])); {false, _} -> {error, node_not_in_cluster}