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

Merge pull request #13588 from thalesmg/20240807-r58-cluster-join-singleton 

fix: use ekka when performing `emqx ctl cluster *`
This commit is contained in:
Thales Macedo Garitezi 2024-08-08 09:51:44 -03:00 committed by GitHub
parent 7711307909 de9e619c96
commit a8882bd7fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/emqx_management/src/emqx_mgmt_cli.erl
View File

@ -97,7 +97,7 @@ broker(_) ->
%% @doc Cluster with other nodes %% @doc Cluster with other nodes
cluster(["join", SNode]) -> cluster(["join", SNode]) ->
case mria:join(ekka_node:parse_name(SNode)) of case ekka:join(ekka_node:parse_name(SNode)) of
ok -> ok ->
emqx_ctl:print("Join the cluster successfully.~n"), emqx_ctl:print("Join the cluster successfully.~n"),
%% FIXME: running status on the replicant immediately %% FIXME: running status on the replicant immediately
@ -112,7 +112,7 @@ cluster(["join", SNode]) ->
end; end;
cluster(["leave"]) -> cluster(["leave"]) ->
_ = maybe_disable_autocluster(), _ = maybe_disable_autocluster(),
case mria:leave() of case ekka:leave() of
ok -> ok ->
emqx_ctl:print("Leave the cluster successfully.~n"), emqx_ctl:print("Leave the cluster successfully.~n"),
cluster(["status"]); cluster(["status"]);
@ -121,7 +121,7 @@ cluster(["leave"]) ->
end; end;
cluster(["force-leave", SNode]) -> cluster(["force-leave", SNode]) ->
Node = ekka_node:parse_name(SNode), Node = ekka_node:parse_name(SNode),
case mria:force_leave(Node) of case ekka:force_leave(Node) of
ok -> ok ->
case emqx_cluster_rpc:force_leave_clean(Node) of case emqx_cluster_rpc:force_leave_clean(Node) of
ok -> ok ->