From 53712e61462e8e617783f2886c2a17387f460ae3 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Thu, 30 Mar 2023 15:11:06 +0800
Subject: [PATCH] fix: running nodes should not include replica nodes

---
 apps/emqx_conf/src/emqx_conf.app.src |  2 +-
 apps/emqx_conf/src/emqx_conf_app.erl | 10 +++++-----
 changes/ce/fix-10313.en.md           |  2 ++
 changes/ce/fix-10313.zh.md           |  2 ++
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changes/ce/fix-10313.en.md
 create mode 100644 changes/ce/fix-10313.zh.md

diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index fbbffba1f..37707431a 100644
--- a/apps/emqx_conf/src/emqx_conf.app.src
+++ b/apps/emqx_conf/src/emqx_conf.app.src
@@ -1,6 +1,6 @@
 {application, emqx_conf, [
     {description, "EMQX configuration management"},
-    {vsn, "0.1.14"},
+    {vsn, "0.1.15"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl
index 34224c3f2..af42f0e1a 100644
--- a/apps/emqx_conf/src/emqx_conf_app.erl
+++ b/apps/emqx_conf/src/emqx_conf_app.erl
@@ -90,13 +90,13 @@ init_conf() ->
     emqx_app:set_init_config_load_done().
 
 cluster_nodes() ->
-    maps:get(running_nodes, ekka_cluster:info()) -- [node()].
+    mria_mnesia:running_nodes() -- [node()].
 
 copy_override_conf_from_core_node() ->
     case cluster_nodes() of
         %% The first core nodes is self.
         [] ->
-            ?SLOG(debug, #{msg => "skip_copy_overide_conf_from_core_node"}),
+            ?SLOG(debug, #{msg => "skip_copy_override_conf_from_core_node"}),
             {ok, ?DEFAULT_INIT_TXN_ID};
         Nodes ->
             {Results, Failed} = emqx_conf_proto_v2:get_override_config_file(Nodes),
@@ -130,7 +130,7 @@ copy_override_conf_from_core_node() ->
                             %% finish the boot sequence and load the
                             %% config for other nodes to copy it.
                             ?SLOG(info, #{
-                                msg => "skip_copy_overide_conf_from_core_node",
+                                msg => "skip_copy_override_conf_from_core_node",
                                 loading_from_disk => true,
                                 nodes => Nodes,
                                 failed => Failed,
@@ -142,7 +142,7 @@ copy_override_conf_from_core_node() ->
                             Jitter = rand:uniform(2_000),
                             Timeout = 10_000 + Jitter,
                             ?SLOG(info, #{
-                                msg => "copy_overide_conf_from_core_node_retry",
+                                msg => "copy_override_conf_from_core_node_retry",
                                 timeout => Timeout,
                                 nodes => Nodes,
                                 failed => Failed,
@@ -155,7 +155,7 @@ copy_override_conf_from_core_node() ->
                     [{ok, Info} | _] = lists:sort(fun conf_sort/2, Ready),
                     #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,
                     ?SLOG(debug, #{
-                        msg => "copy_overide_conf_from_core_node_success",
+                        msg => "copy_override_conf_from_core_node_success",
                         node => Node,
                         cluster_override_conf_file => application:get_env(
                             emqx, cluster_override_conf_file
diff --git a/changes/ce/fix-10313.en.md b/changes/ce/fix-10313.en.md
new file mode 100644
index 000000000..ca1a3b391
--- /dev/null
+++ b/changes/ce/fix-10313.en.md
@@ -0,0 +1,2 @@
+Ensure that when the core or replicant node starting, the `cluster-override.conf` file is only copied from the core node.
+Previously, when sorting nodes by startup time, the core node may have copied this file from the replicant node.
diff --git a/changes/ce/fix-10313.zh.md b/changes/ce/fix-10313.zh.md
new file mode 100644
index 000000000..94f118ece
--- /dev/null
+++ b/changes/ce/fix-10313.zh.md
@@ -0,0 +1,2 @@
+确保当 core 或 replicant 节点启动时，仅从 core 节点复制 `cluster-override.conf` 文件。
+此前按照节点启动时间排序时，core 节点可能从 replicant 节点复制该文件。