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

chore: choose core node's max tnxid as source conf

This commit is contained in:
Zhongwen Deng 2022-06-28 10:11:52 +08:00
parent 57a36e53da
commit 130d1f7d9c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_conf/src/emqx_conf_app.erl
View File

@ -140,10 +140,14 @@ copy_override_conf_from_core_node() ->
end; end;
_ -> _ ->
SortFun = fun( SortFun = fun(
{ok, #{wall_clock := W1}}, {ok, #{wall_clock := W1, tnx_id := TnxId1}},
{ok, #{wall_clock := W2}} {ok, #{wall_clock := W2, tnx_id := TnxId2}}
) -> ) ->
W1 > W2 if
TnxId1 > TnxId2 -> true;
TnxId1 =:= TnxId2 -> W1 > W2;
true -> false
end
end, end,
[{ok, Info} | _] = lists:sort(SortFun, Ready), [{ok, Info} | _] = lists:sort(SortFun, Ready),
#{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info, #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,