@@ -387,28 +387,25 @@ remove_node_when_seed_node_is_leader(Config) ->
387
387
AMember = {rabbit_khepri :get_store_id (), A },
388
388
ra :transfer_leadership (AMember , AMember ),
389
389
clustering_utils :assert_cluster_status ({Cluster , Cluster }, Cluster ),
390
+ ct :pal (" Waiting for cluster change permitted on node A" ),
390
391
? awaitMatch (
391
- {ok , #{cluster_change_permitted := true }, _ },
392
+ {ok , #{cluster_change_permitted := true }, AMember },
392
393
rabbit_ct_broker_helpers :rpc (
393
394
Config1 , A , ra , member_overview , [AMember ]),
394
395
60000 ),
396
+ {ok , Overview , AMember } = rabbit_ct_broker_helpers :rpc (
397
+ Config1 , A , ra , member_overview , [AMember ]),
398
+ ct :pal (" Member A overview: ~p " , [maps :remove (machine , Overview )]),
395
399
396
400
% % Minority partition: A
397
401
partition_3_node_cluster (Config1 ),
398
402
399
- Pong = ra :ping (AMember , 10000 ),
400
- ct :pal (" Member A state: ~0p " , [Pong ]),
401
- case Pong of
402
- {pong , leader } ->
403
- ? awaitMatch (
404
- ok ,
405
- rabbit_control_helper :command (
406
- forget_cluster_node , A , [atom_to_list (B )], []),
407
- 60000 );
408
- Ret ->
409
- ct :pal (" A is not the expected leader: ~p " , [Ret ]),
410
- {skip , " Node A was not a leader" }
411
- end .
403
+ ? assertEqual ({pong , leader }, ra :ping (AMember , 10000 )),
404
+ ? awaitMatch (
405
+ ok ,
406
+ rabbit_control_helper :command (
407
+ forget_cluster_node , A , [atom_to_list (B )], []),
408
+ 60000 ).
412
409
413
410
remove_node_when_seed_node_is_follower (Config ) ->
414
411
[A , B , C | _ ] = rabbit_ct_broker_helpers :get_node_configs (
0 commit comments