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

fix(test): cluster_rpc retry interval incorrect (#6038)

This commit is contained in:
zhongwencool 2021-11-08 23:23:17 +08:00 committed by GitHub
parent 5726444645
commit b873b92717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,22 +121,16 @@ t_catch_up_status_handle_next_commit(_Config) ->
t_commit_ok_apply_fail_on_other_node_then_recover(_Config) -> t_commit_ok_apply_fail_on_other_node_then_recover(_Config) ->
emqx_cluster_rpc:reset(), emqx_cluster_rpc:reset(),
{atomic, []} = emqx_cluster_rpc:status(), {atomic, []} = emqx_cluster_rpc:status(),
Now = erlang:system_time(millisecond), ets:new(test, [named_table, public]),
ct:pal("111:~p~n", [ets:tab2list(cluster_rpc_commit)]), ct:pal("111:~p~n", [ets:tab2list(cluster_rpc_commit)]),
{M, F, A} = {?MODULE, failed_on_other_recover_after_5_second, [erlang:whereis(?NODE1), Now]}, {M, F, A} = {?MODULE, failed_on_other_recover_after_retry, [erlang:whereis(?NODE1)]},
{ok, 1, ok} = emqx_cluster_rpc:multicall(M, F, A, 1, 1000), {ok, 1, ok} = emqx_cluster_rpc:multicall(M, F, A, 1, 1000),
ct:pal("222:~p~n", [ets:tab2list(cluster_rpc_commit)]), ct:pal("222:~p~n", [ets:tab2list(cluster_rpc_commit)]),
{ok, 2, ok} = emqx_cluster_rpc:multicall(io, format, ["test"], 1, 1000), ct:pal("333:~p~n", [emqx_cluster_rpc:status()]),
ct:pal("333:~p~n", [ets:tab2list(cluster_rpc_commit)]), {atomic, [_Status|L]} = emqx_cluster_rpc:status(),
ct:pal("444:~p~n", [emqx_cluster_rpc:status()]),
{atomic, [Status|L]} = emqx_cluster_rpc:status(),
?assertEqual([], L), ?assertEqual([], L),
?assertEqual({io, format, ["test"]}, maps:get(mfa, Status)), {ok, 2, ok} = emqx_cluster_rpc:multicall(io, format, ["test"], 1, 1000),
?assertEqual(node(), maps:get(node, Status)), ct:sleep(1000),
ct:sleep(2300),
{atomic, [Status1]} = emqx_cluster_rpc:status(),
?assertEqual(Status, Status1),
ct:sleep(3600),
{atomic, NewStatus} = emqx_cluster_rpc:status(), {atomic, NewStatus} = emqx_cluster_rpc:status(),
?assertEqual(3, length(NewStatus)), ?assertEqual(3, length(NewStatus)),
Pid = self(), Pid = self(),
@ -244,12 +238,12 @@ failed_on_node_by_odd(Pid) ->
end end
end. end.
failed_on_other_recover_after_5_second(Pid, CreatedAt) -> failed_on_other_recover_after_retry(Pid) ->
Now = erlang:system_time(millisecond), Counter = ets:update_counter(test, counter, 1, {counter, 0}),
case Pid =:= self() of case Pid =:= self() of
true -> ok; true -> ok;
false -> false ->
case Now < CreatedAt + 5001 of case Counter < 4 of
true -> "MFA return not ok"; true -> "MFA return not ok";
false -> ok false -> ok
end end