@@ -1353,26 +1353,31 @@ force_checkpoint_on_queue(Config) ->
13531353 ? assertEqual ({'queue.declare_ok' , QQ , 0 , 0 },
13541354 declare (Ch , QQ , [{<<" x-queue-type" >>, longstr , <<" quorum" >>}])),
13551355
1356- rabbit_ct_client_helpers :publish (Ch , QQ , 3 ),
1357- wait_for_messages_ready ([Server0 ], RaName , 3 ),
1356+ N = 17000 ,
1357+ rabbit_ct_client_helpers :publish (Ch , QQ , N ),
1358+ wait_for_messages_ready ([Server0 ], RaName , N ),
13581359
1359- % Wait for initial checkpoint and make sure it's 0; checkpoint hasn't been triggered yet.
1360+ % % The state before any checkpoints
13601361 rabbit_ct_helpers :await_condition (
13611362 fun () ->
1362- {ok , #{ aux : = Aux } , _ } = rpc :call (Server0 , ra , member_overview , [{RaName , Server0 }]),
1363- # aux_v3 { last_checkpoint = # checkpoint { index = Index }} = Aux ,
1364- Index =:= 0
1363+ {ok , State , _ } = rpc :call (Server0 , ra , member_overview , [{RaName , Server0 }]),
1364+ #{ log : = #{ latest_checkpoint_index : = LCI }} = State ,
1365+ LCI =:= undefined
13651366 end ),
13661367
1368+ % % {ok, State0, _} = rpc:call(Server0, ra, member_overview, [{RaName, Server0}]),
1369+ % % ct:pal("Ra server state before forcing a checkpoint: ~tp~n", [State0]),
1370+
13671371 rabbit_ct_broker_helpers :rpc (Config , 0 , rabbit_quorum_queue ,
13681372 force_checkpoint_on_queue , [QName ]),
13691373
1370- % Wait for initial checkpoint and make sure it's not 0
1374+ % % Wait for initial checkpoint and make sure it's not 0
13711375 rabbit_ct_helpers :await_condition (
13721376 fun () ->
1373- {ok , #{aux := Aux }, _ } = rpc :call (Server0 , ra , member_overview , [{RaName , Server0 }]),
1374- # aux_v3 {last_checkpoint = # checkpoint {index = Index }} = Aux ,
1375- Index =/= 0
1377+ {ok , State , _ } = rpc :call (Server0 , ra , member_overview , [{RaName , Server0 }]),
1378+ % % ct:pal("Ra server state: ~tp~n", [State]),
1379+ #{log := #{latest_checkpoint_index := LCI }} = State ,
1380+ LCI >= N
13761381 end ).
13771382
13781383force_checkpoint (Config ) ->
0 commit comments