Skip to content

Commit d5f4501

Browse files
committed
cluster_minority_SUITE
1 parent 48b7956 commit d5f4501

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

deps/rabbit/test/cluster_minority_SUITE.erl

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -387,28 +387,25 @@ remove_node_when_seed_node_is_leader(Config) ->
387387
AMember = {rabbit_khepri:get_store_id(), A},
388388
ra:transfer_leadership(AMember, AMember),
389389
clustering_utils:assert_cluster_status({Cluster, Cluster}, Cluster),
390+
ct:pal("Waiting for cluster change permitted on node A"),
390391
?awaitMatch(
391-
{ok, #{cluster_change_permitted := true}, _},
392+
{ok, #{cluster_change_permitted := true}, AMember},
392393
rabbit_ct_broker_helpers:rpc(
393394
Config1, A, ra, member_overview, [AMember]),
394395
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)]),
395399

396400
%% Minority partition: A
397401
partition_3_node_cluster(Config1),
398402

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).
412409

413410
remove_node_when_seed_node_is_follower(Config) ->
414411
[A, B, C | _] = rabbit_ct_broker_helpers:get_node_configs(

0 commit comments

Comments
 (0)