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

chore: Apply suggestions from code review 

Co-authored-by: Zaiming (Stone) Shi <zmstone@gmail.com>
This commit is contained in:
zhongwencool 2022-09-06 16:09:08 +08:00 committed by Zhongwen Deng
parent 1175008a74
commit 758b1979ab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@
-define(TIMEOUT, timer:minutes(1)). -define(TIMEOUT, timer:minutes(1)).
-define(APPLY_KIND_REPLICATE, replicate). -define(APPLY_KIND_REPLICATE, replicate).
-define(APPLY_KIND_INITIATE, initiate). -define(APPLY_KIND_INITIATE, initiate).
-define(IS_ACTION(_A_), (_A_ =:= peers_lagging orelse _A_ =:= stopped_nodes)). -define(IS_STATUS(_A_), (_A_ =:= peers_lagging orelse _A_ =:= stopped_nodes)).
-type tnx_id() :: pos_integer(). -type tnx_id() :: pos_integer().
@ -130,7 +130,7 @@ start_link(Node, Name, RetryMs) ->
%% returning the result. %% returning the result.
%% %%
%% In case of partial success, an `error' level log is emitted %% In case of partial success, an `error' level log is emitted
%% but the initial locally apply result is returned. %% but the initial local apply result is returned.
-spec multicall(module(), atom(), list()) -> term(). -spec multicall(module(), atom(), list()) -> term().
multicall(M, F, A) -> multicall(M, F, A) ->
multicall(M, F, A, all, timer:minutes(2)). multicall(M, F, A, all, timer:minutes(2)).
@ -142,11 +142,11 @@ multicall(M, F, A, RequiredSyncs, Timeout) when RequiredSyncs =:= all orelse Req
Result; Result;
{init_failure, Error} -> {init_failure, Error} ->
Error; Error;
{Action, TnxId, Res, Nodes} when ?IS_ACTION(Action) -> {Status, TnxId, Res, Nodes} when ?IS_STATUS(Status) ->
%% The init MFA return ok, but some other nodes failed. %% The init MFA return ok, but some other nodes failed.
?SLOG(error, #{ ?SLOG(error, #{
msg => "cluster_rpc_peers_lagging", msg => "cluster_rpc_peers_lagging",
action => Action, status=> Status,
nodes => Nodes, nodes => Nodes,
tnx_id => TnxId tnx_id => TnxId
}), }),
@ -195,9 +195,9 @@ do_multicall(M, F, A, RequiredSyncs, Timeout) ->
InitRes; InitRes;
{init_failure, Error0} -> {init_failure, Error0} ->
{init_failure, Error0}; {init_failure, Error0};
{Action, Nodes} when ?IS_ACTION(Action) -> {Status, Nodes} when ?IS_STATUS(Status) ->
{ok, TnxId0, MFARes} = InitRes, {ok, TnxId0, MFARes} = InitRes,
{Action, TnxId0, MFARes, Nodes} {Status, TnxId0, MFARes, Nodes}
end. end.
-spec query(pos_integer()) -> {'atomic', map()} | {'aborted', Reason :: term()}. -spec query(pos_integer()) -> {'atomic', map()} | {'aborted', Reason :: term()}.