Revert "Bump a few timeouts in a flakey suite"
This reverts commitfe2b79835b. The issue turned out to be a legitimate bug in Ra, addressed inecb176b10c.
This commit is contained in:
parent
1518d103e7
commit
fa98a41549
|
|
@ -137,7 +137,7 @@ basics(Config) ->
|
||||||
{_, _} = rabbit_fifo_client:return(Ctag, [Mid], FState7),
|
{_, _} = rabbit_fifo_client:return(Ctag, [Mid], FState7),
|
||||||
ok
|
ok
|
||||||
end
|
end
|
||||||
after 5000 ->
|
after 2000 ->
|
||||||
exit(await_msg_timeout)
|
exit(await_msg_timeout)
|
||||||
end,
|
end,
|
||||||
rabbit_quorum_queue:stop_server(ServerId),
|
rabbit_quorum_queue:stop_server(ServerId),
|
||||||
|
|
@ -172,7 +172,7 @@ rabbit_fifo_returns_correlation(Config) ->
|
||||||
Del ->
|
Del ->
|
||||||
exit({unexpected, Del})
|
exit({unexpected, Del})
|
||||||
end
|
end
|
||||||
after 5000 ->
|
after 2000 ->
|
||||||
exit(await_msg_timeout)
|
exit(await_msg_timeout)
|
||||||
end,
|
end,
|
||||||
rabbit_quorum_queue:stop_server(ServerId),
|
rabbit_quorum_queue:stop_server(ServerId),
|
||||||
|
|
@ -205,7 +205,7 @@ duplicate_delivery(Config) ->
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
after 5000 ->
|
after 2000 ->
|
||||||
exit(await_msg_timeout)
|
exit(await_msg_timeout)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
@ -224,7 +224,7 @@ usage(Config) ->
|
||||||
{_, _, _} = process_ra_events(receive_ra_events(2, 2), F3),
|
{_, _, _} = process_ra_events(receive_ra_events(2, 2), F3),
|
||||||
% force tick and usage stats emission
|
% force tick and usage stats emission
|
||||||
ServerId ! tick_timeout,
|
ServerId ! tick_timeout,
|
||||||
timer:sleep(100),
|
timer:sleep(50),
|
||||||
Use = rabbit_fifo:usage(element(1, ServerId)),
|
Use = rabbit_fifo:usage(element(1, ServerId)),
|
||||||
rabbit_quorum_queue:stop_server(ServerId),
|
rabbit_quorum_queue:stop_server(ServerId),
|
||||||
?assert(Use > 0.0),
|
?assert(Use > 0.0),
|
||||||
|
|
@ -306,7 +306,7 @@ returns_after_down(Config) ->
|
||||||
Self ! checkout_done
|
Self ! checkout_done
|
||||||
end),
|
end),
|
||||||
receive checkout_done -> ok after 1000 -> exit(checkout_done_timeout) end,
|
receive checkout_done -> ok after 1000 -> exit(checkout_done_timeout) end,
|
||||||
timer:sleep(2000),
|
timer:sleep(1000),
|
||||||
% message should be available for dequeue
|
% message should be available for dequeue
|
||||||
{ok, _, {_, _, _, _, msg1}, _} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F2),
|
{ok, _, {_, _, _, _, msg1}, _} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F2),
|
||||||
rabbit_quorum_queue:stop_server(ServerId),
|
rabbit_quorum_queue:stop_server(ServerId),
|
||||||
|
|
@ -325,7 +325,7 @@ resends_after_lost_applied(Config) ->
|
||||||
receive
|
receive
|
||||||
{ra_event, _, {applied, _}} ->
|
{ra_event, _, {applied, _}} ->
|
||||||
ok
|
ok
|
||||||
after 2000 ->
|
after 500 ->
|
||||||
exit(await_ra_event_timeout)
|
exit(await_ra_event_timeout)
|
||||||
end,
|
end,
|
||||||
% send another message
|
% send another message
|
||||||
|
|
@ -354,7 +354,7 @@ handles_reject_notification(Config) ->
|
||||||
F0 = rabbit_fifo_client:init(ClusterName, [ServerId2, ServerId1]),
|
F0 = rabbit_fifo_client:init(ClusterName, [ServerId2, ServerId1]),
|
||||||
{ok, F1} = rabbit_fifo_client:enqueue(one, F0),
|
{ok, F1} = rabbit_fifo_client:enqueue(one, F0),
|
||||||
|
|
||||||
timer:sleep(1000),
|
timer:sleep(500),
|
||||||
|
|
||||||
% the applied notification
|
% the applied notification
|
||||||
_F2 = process_ra_events(receive_ra_events(1, 0), F1),
|
_F2 = process_ra_events(receive_ra_events(1, 0), F1),
|
||||||
|
|
@ -391,7 +391,7 @@ discard(Config) ->
|
||||||
[msg1] = Letters,
|
[msg1] = Letters,
|
||||||
rejected = Reason,
|
rejected = Reason,
|
||||||
ok
|
ok
|
||||||
after 1000 ->
|
after 500 ->
|
||||||
flush(),
|
flush(),
|
||||||
exit(dead_letter_timeout)
|
exit(dead_letter_timeout)
|
||||||
end,
|
end,
|
||||||
|
|
@ -456,7 +456,7 @@ untracked_enqueue(Config) ->
|
||||||
ok = start_cluster(ClusterName, [ServerId]),
|
ok = start_cluster(ClusterName, [ServerId]),
|
||||||
|
|
||||||
ok = rabbit_fifo_client:untracked_enqueue([ServerId], msg1),
|
ok = rabbit_fifo_client:untracked_enqueue([ServerId], msg1),
|
||||||
timer:sleep(500),
|
timer:sleep(100),
|
||||||
F0 = rabbit_fifo_client:init(ClusterName, [ServerId]),
|
F0 = rabbit_fifo_client:init(ClusterName, [ServerId]),
|
||||||
{ok, _, {_, _, _, _, msg1}, _F5} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F0),
|
{ok, _, {_, _, _, _, msg1}, _F5} = rabbit_fifo_client:dequeue(<<"tag">>, settled, F0),
|
||||||
rabbit_quorum_queue:stop_server(ServerId),
|
rabbit_quorum_queue:stop_server(ServerId),
|
||||||
|
|
@ -578,7 +578,7 @@ receive_ra_events(Acc) ->
|
||||||
receive
|
receive
|
||||||
{ra_event, _, _} = Evt ->
|
{ra_event, _, _} = Evt ->
|
||||||
receive_ra_events([Evt | Acc])
|
receive_ra_events([Evt | Acc])
|
||||||
after 1000 ->
|
after 500 ->
|
||||||
Acc
|
Acc
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue