Skip to content

Commit 901343d

Browse files
michaelklishinmergify[bot]
authored andcommitted
quorum_queue_SUITE: keep Raft state logging in force_checkpoint_on_queue
(cherry picked from commit 7d3292c)
1 parent 1a998f8 commit 901343d

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

deps/rabbit/test/quorum_queue_SUITE.erl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ force_checkpoint_on_queue(Config) ->
13471347
?assertEqual({'queue.declare_ok', QQ, 0, 0},
13481348
declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}])),
13491349

1350-
N = 17000,
1350+
N = 20_000,
13511351
rabbit_ct_client_helpers:publish(Ch, QQ, N),
13521352
wait_for_messages_ready([Server0], RaName, N),
13531353

@@ -1359,19 +1359,21 @@ force_checkpoint_on_queue(Config) ->
13591359
LCI =:= undefined
13601360
end),
13611361

1362-
%% {ok, State0, _} = rpc:call(Server0, ra, member_overview, [{RaName, Server0}]),
1363-
%% ct:pal("Ra server state before forcing a checkpoint: ~tp~n", [State0]),
1362+
{ok, State0, _} = rpc:call(Server0, ra, member_overview, [{RaName, Server0}]),
1363+
ct:pal("Ra server state before forcing a checkpoint: ~tp~n", [State0]),
13641364

1365+
%% wait for longer than ?CHECK_MIN_INTERVAL_MS ms
1366+
timer:sleep(?CHECK_MIN_INTERVAL_MS + 1000),
13651367
rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_quorum_queue,
13661368
force_checkpoint_on_queue, [QName]),
13671369

13681370
%% Wait for initial checkpoint and make sure it's not 0
13691371
rabbit_ct_helpers:await_condition(
13701372
fun() ->
13711373
{ok, State, _} = rpc:call(Server0, ra, member_overview, [{RaName, Server0}]),
1372-
%% ct:pal("Ra server state: ~tp~n", [State]),
1374+
ct:pal("Ra server state post forced checkpoint: ~tp~n", [State]),
13731375
#{log := #{latest_checkpoint_index := LCI}} = State,
1374-
LCI >= N
1376+
(LCI =/= undefined) andalso (LCI >= N)
13751377
end).
13761378

13771379
force_checkpoint(Config) ->

0 commit comments

Comments
 (0)