From 130d1f7d9cc27f7e8b1719fbbad754fa5713e2d0 Mon Sep 17 00:00:00 2001 From: Zhongwen Deng Date: Tue, 28 Jun 2022 10:11:52 +0800 Subject: [PATCH] chore: choose core node's max tnxid as source conf --- apps/emqx_conf/src/emqx_conf_app.erl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl index 61c56a398..7b5f5c3cb 100644 --- a/apps/emqx_conf/src/emqx_conf_app.erl +++ b/apps/emqx_conf/src/emqx_conf_app.erl @@ -140,10 +140,14 @@ copy_override_conf_from_core_node() -> end; _ -> SortFun = fun( - {ok, #{wall_clock := W1}}, - {ok, #{wall_clock := W2}} + {ok, #{wall_clock := W1, tnx_id := TnxId1}}, + {ok, #{wall_clock := W2, tnx_id := TnxId2}} ) -> - W1 > W2 + if + TnxId1 > TnxId2 -> true; + TnxId1 =:= TnxId2 -> W1 > W2; + true -> false + end end, [{ok, Info} | _] = lists:sort(SortFun, Ready), #{node := Node, conf := RawOverrideConf, tnx_id := TnxId} = Info,