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

test: fix cluster_rpc test failed

This commit is contained in:
zhongwencool 2024-06-10 22:19:55 +08:00
parent 2069910ad1
commit 3ed4340145
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_conf/src/emqx_conf_cli.erl
View File

@ -104,7 +104,8 @@ admins(["fix"]) ->
AllConfs = find_running_confs(), AllConfs = find_running_confs(),
case find_inconsistent(Status, AllConfs) of case find_inconsistent(Status, AllConfs) of
{inconsistent_tnx_id_key, Target, InconsistentKeys} -> {inconsistent_tnx_id_key, Target, InconsistentKeys} ->
fix_inconsistent_with_raw(Target, InconsistentKeys); _ = fix_inconsistent_with_raw(Target, InconsistentKeys),
ok;
inconsistent_tnx_id -> inconsistent_tnx_id ->
print_tnx_id_status(Status), print_tnx_id_status(Status),
ok = emqx_cluster_rpc:reset(), ok = emqx_cluster_rpc:reset(),

15
apps/emqx_conf/test/emqx_cluster_rpc_SUITE.erl
View File

@ -142,13 +142,14 @@ t_commit_ok_but_apply_fail_on_other_node(_Config) ->
Res2 = gen_server:call(?NODE3, Call), Res2 = gen_server:call(?NODE3, Call),
%% Node2 is retry on tnx_id 1, and should not run Next MFA. %% Node2 is retry on tnx_id 1, and should not run Next MFA.
?assertMatch( ?assertMatch(
{init_failure, #{ {init_failure,
msg := stale_view_of_cluster_state, {error, #{
retry_times := 2, msg := stale_view_of_cluster_state,
cluster_tnx_id := 2, retry_times := 2,
node_tnx_id := 1, cluster_tnx_id := 2,
suggested := _ node_tnx_id := 1,
}}, suggested := _
}}},
Res1 Res1
), ),
?assertEqual(Res1, Res2), ?assertEqual(Res1, Res2),

1
changes/ce/feat-13202.en.md Normal file
View File

@ -0,0 +1 @@
Introduce `emqx_cli conf cluster_sync fix` to address cluster inconsistencies. It synchronizes the configuration of the node with the largest `tnx_id` to all nodes.