From 2f208c3ab973ea0bcf0ba2d7e85d1c8ec1072b1e Mon Sep 17 00:00:00 2001
From: ieQu1 <99872536+ieQu1@users.noreply.github.com>
Date: Wed, 14 Dec 2022 10:39:44 +0100
Subject: [PATCH 1/2] fix(cluster_rpc): Detect stopped replicant nodes

---
 apps/emqx_conf/src/emqx_cluster_rpc.erl | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_cluster_rpc.erl b/apps/emqx_conf/src/emqx_cluster_rpc.erl
index d8b195587..fe701049c 100644
--- a/apps/emqx_conf/src/emqx_cluster_rpc.erl
+++ b/apps/emqx_conf/src/emqx_cluster_rpc.erl
@@ -512,7 +512,7 @@ do_alarm(Fun, Res, #{tnx_id := Id} = Meta) ->
 
 wait_for_all_nodes_commit(TnxId, Delay, Remain) ->
     Lagging = lagging_nodes(TnxId),
-    Stopped = stopped_nodes(),
+    Stopped = Lagging -- mria_mnesia:running_nodes(),
     case Lagging -- Stopped of
         [] when Stopped =:= [] ->
             ok;
@@ -537,9 +537,10 @@ wait_for_nodes_commit(RequiredSyncs, TnxId, Delay, Remain) ->
                 [] ->
                     ok;
                 Lagging ->
-                    case stopped_nodes() of
+                    Stopped = Lagging -- mria_mnesia:running_nodes(),
+                    case Stopped of
                         [] -> {peers_lagging, Lagging};
-                        Stopped -> {stopped_nodes, Stopped}
+                        _ -> {stopped_nodes, Stopped}
                     end
             end
     end.
@@ -558,9 +559,6 @@ commit_status_trans(Operator, TnxId) ->
     Result = '$2',
     mnesia:select(?CLUSTER_COMMIT, [{MatchHead, [Guard], [Result]}]).
 
-stopped_nodes() ->
-    ekka_cluster:info(stopped_nodes).
-
 get_retry_ms() ->
     emqx_conf:get([node, cluster_call, retry_interval], timer:minutes(1)).
 

From ced5a2705337beb6c06fd31c4206b572d1648a49 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Mon, 2 Jan 2023 21:30:02 +0100
Subject: [PATCH 2/2] test: fix emqx_conf test cases

---
 apps/emqx_conf/src/emqx_conf.app.src           | 2 +-
 apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_conf/src/emqx_conf.app.src b/apps/emqx_conf/src/emqx_conf.app.src
index 6d7e9ef9c..3d18083f8 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.8"},
+    {vsn, "0.1.9"},
     {registered, []},
     {mod, {emqx_conf_app, []}},
     {applications, [kernel, stdlib]},
diff --git a/apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl b/apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl
index d4b28e946..4c449f580 100644
--- a/apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl
+++ b/apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl
@@ -48,11 +48,14 @@ init_per_suite(Config) ->
     meck:new(emqx_alarm, [non_strict, passthrough, no_link]),
     meck:expect(emqx_alarm, activate, 3, ok),
     meck:expect(emqx_alarm, deactivate, 3, ok),
+    meck:new(mria_mnesia, [non_strict, passthrough, no_link]),
+    meck:expect(mria_mnesia, running_nodes, 0, [?NODE1, {node(), ?NODE2}, {node(), ?NODE3}]),
     Config.
 
 end_per_suite(_Config) ->
     ekka:stop(),
     mria:stop(),
+    meck:unload(mria_mnesia),
     mria_mnesia:delete_schema(),
     meck:unload(emqx_alarm),
     ok.