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

chore: improve wait_for_nodes_commit/4 function

This commit is contained in:
Zhongwen Deng 2022-09-06 16:17:51 +08:00
parent 758b1979ab
commit 33341011d8
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/emqx_conf/src/emqx_cluster_rpc.erl
View File

@ -146,7 +146,7 @@ multicall(M, F, A, RequiredSyncs, Timeout) when RequiredSyncs =:= all orelse Req
%% The init MFA return ok, but some other nodes failed.
?SLOG(error, #{
msg => "cluster_rpc_peers_lagging",
status=> Status,
status => Status,
nodes => Nodes,
tnx_id => TnxId
}),
@ -511,7 +511,7 @@ do_alarm(Fun, Res, #{tnx_id := Id} = Meta) ->
emqx_alarm:Fun(cluster_rpc_apply_failed, Meta#{result => ?TO_BIN(Res)}, AlarmMsg).
wait_for_all_nodes_commit(TnxId, Delay, Remain) ->
Lagging = lagging_node(TnxId),
Lagging = lagging_nodes(TnxId),
Stopped = stopped_nodes(),
case Lagging -- Stopped of
[] when Stopped =:= [] ->
@ -533,17 +533,18 @@ wait_for_nodes_commit(RequiredSyncs, TnxId, Delay, Remain) ->
false when Remain > 0 ->
wait_for_nodes_commit(RequiredSyncs, TnxId, Delay, Remain - Delay);
false ->
Lagging = lagging_node(TnxId),
Stopped = stopped_nodes(),
case Lagging -- Stopped of
%% All commit but The succeedNum > length(nodes()).
[] when Stopped =:= [] -> ok;
[] -> {stopped_nodes, Stopped};
[_ | _] -> {peers_lagging, Lagging}
case lagging_nodes(TnxId) of
[] ->
ok;
Lagging ->
case stopped_nodes() of
[] -> {peers_lagging, Lagging};
Stopped -> {stopped_nodes, Stopped}
end
end
end.
lagging_node(TnxId) ->
lagging_nodes(TnxId) ->
{atomic, Nodes} = transaction(fun ?MODULE:commit_status_trans/2, ['<', TnxId]),
Nodes.