From 3a5112829c84a0d7902ae394dbe864c4fd854769 Mon Sep 17 00:00:00 2001
From: ieQu1 <99872536+ieQu1@users.noreply.github.com>
Date: Tue, 18 Jul 2023 18:07:10 +0200
Subject: [PATCH] fix(mgmt_cli): Don't print cluster status on the replicant

---
 apps/emqx_management/src/emqx_mgmt_cli.erl | 10 ++++++----
 changes/ce/fix-11294.en.md                 |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 changes/ce/fix-11294.en.md

diff --git a/apps/emqx_management/src/emqx_mgmt_cli.erl b/apps/emqx_management/src/emqx_mgmt_cli.erl
index f778ec790..9692441a6 100644
--- a/apps/emqx_management/src/emqx_mgmt_cli.erl
+++ b/apps/emqx_management/src/emqx_mgmt_cli.erl
@@ -113,7 +113,11 @@ cluster(["join", SNode]) ->
     case mria:join(ekka_node:parse_name(SNode)) of
         ok ->
             emqx_ctl:print("Join the cluster successfully.~n"),
-            cluster(["status"]);
+            %% FIXME: running status on the replicant immediately
+            %% after join produces stale output
+            mria_rlog:role() =:= core andalso
+                cluster(["status"]),
+            ok;
         ignore ->
             emqx_ctl:print("Ignore.~n");
         {error, Error} ->
@@ -158,9 +162,7 @@ sort_map_list_fields(Map) when is_map(Map) ->
         end,
         Map,
         maps:keys(Map)
-    );
-sort_map_list_fields(NotMap) ->
-    NotMap.
+    ).
 
 sort_map_list_field(Field, Map) ->
     case maps:get(Field, Map) of
diff --git a/changes/ce/fix-11294.en.md b/changes/ce/fix-11294.en.md
new file mode 100644
index 000000000..c9ee1cdc5
--- /dev/null
+++ b/changes/ce/fix-11294.en.md
@@ -0,0 +1 @@
+Fix `emqx_ctl cluster join`, `leave`, and `status` commands.