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] 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)).