Skip to content

Commit 47ca828

Browse files
committed
Revert "quorum_queue_member_reconciliation_SUITE: Disconnect node after removing it from cluster"
This reverts commit 50aec18.
1 parent 5eaf987 commit 47ca828

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,8 @@ reset_nodes([], _Leader) ->
9191
ok;
9292
reset_nodes([Node| Nodes], Leader) ->
9393
ok = rabbit_control_helper:command(stop_app, Node),
94-
case rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]) of
95-
ok -> ok;
96-
{error, 69,
97-
<<"Error:\n{:not_a_cluster_node, ~c\"The node selected is not in the cluster.\"}">>} -> ok
98-
end,
94+
ok = rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]),
9995
ok = rabbit_control_helper:command(reset, Node),
100-
%% Disconnect explicitly nodes from the node we just reset because it way
101-
%% interfere with the restart of RabbitMQ below and peer discovery.
102-
ClusterNodes = rpc:call(Leader, rabbit_db_cluster, members, []),
103-
lists:foreach(
104-
fun(N) ->
105-
_ = catch erpc:call(
106-
N,
107-
erlang, disconnect_node, [Node])
108-
end, ClusterNodes),
10996
ok = rabbit_control_helper:command(start_app, Node),
11097
reset_nodes(Nodes, Leader).
11198

0 commit comments

Comments
 (0)