Skip to content

Do not contact disconnected nodes in rabbit_nodes:list_running/0 (backport #10353) #10366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 18, 2024
Merged

Do not contact disconnected nodes in rabbit_nodes:list_running/0 (backport #10353) #10366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
75a1baf
Do not attempt to contact disconnected nodes in rabbit_nodes:list_run…
kjnilsson Jan 17, 2024
a954e9b
Remove clustering test that assert on ram nodes.
kjnilsson Jan 17, 2024
1867788
Explicity try to reconnect to all members after doing cluster rename.
kjnilsson Jan 18, 2024
d56c488
Ensure node reconnections are done as before in rabbit_node_monitor
kjnilsson Jan 18, 2024
385ae9b
Resolve a conflict #10366 #10353
michaelklishin Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deps/rabbit/src/rabbit_mnesia_rename.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ maybe_finish(AllNodes) ->
finish(FromNode, ToNode, AllNodes) ->
case node() of
ToNode ->
%% filter_running/1 does not perform reconnections so we need
%% to do that manually
_ = [net_kernel:connect_node(N) || N <- AllNodes],
case rabbit_nodes:filter_running(AllNodes) of
[] -> finish_primary(FromNode, ToNode);
_ -> finish_secondary(FromNode, ToNode, AllNodes)
Expand Down
13 changes: 9 additions & 4 deletions deps/rabbit/src/rabbit_node_monitor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ notify_node_up() ->

notify_joined_cluster() ->
NewMember = node(),
Nodes = rabbit_nodes:list_running() -- [NewMember],
Nodes = alive_rabbit_nodes() -- [NewMember],
gen_server:abcast(Nodes, ?SERVER,
{joined_cluster, node(), rabbit_mnesia:node_type()}),

Expand All @@ -177,7 +177,7 @@ notify_joined_cluster() ->
-spec notify_left_cluster(node()) -> 'ok'.

notify_left_cluster(Node) ->
Nodes = rabbit_nodes:list_running(),
Nodes = alive_rabbit_nodes(),
gen_server:abcast(Nodes, ?SERVER, {left_cluster, Node}),
ok.

Expand Down Expand Up @@ -962,19 +962,24 @@ alive_nodes() -> rabbit_nodes:list_reachable().

alive_nodes(Nodes) -> rabbit_nodes:filter_reachable(Nodes).

alive_rabbit_nodes() -> rabbit_nodes:list_running().
alive_rabbit_nodes() ->
alive_rabbit_nodes(rabbit_nodes:list_members()).

-spec alive_rabbit_nodes([node()]) -> [node()].

alive_rabbit_nodes(Nodes) ->
ok = ping(Nodes),
rabbit_nodes:filter_running(Nodes).

%% This one is allowed to connect!

-spec ping_all() -> 'ok'.

ping_all() ->
[net_adm:ping(N) || N <- rabbit_nodes:list_members()],
ping(rabbit_nodes:list_members()).

ping(Nodes) ->
_ = [net_adm:ping(N) || N <- Nodes],
ok.

possibly_partitioned_nodes() ->
Expand Down
5 changes: 3 additions & 2 deletions deps/rabbit/src/rabbit_nodes.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,10 @@ filter_not_running(Nodes) ->
do_filter_running(Members) ->
%% All clustered members where `rabbit' is running, regardless if they are
%% under maintenance or not.
ReachableMembers = do_filter_reachable(Members),
Rets = erpc:multicall(
Members, rabbit, is_running, [], ?FILTER_RPC_TIMEOUT),
RetPerMember = lists:zip(Members, Rets),
ReachableMembers, rabbit, is_running, [], ?FILTER_RPC_TIMEOUT),
RetPerMember = lists:zip(ReachableMembers, Rets),
lists:filtermap(
fun
({Member, {ok, true}}) ->
Expand Down
23 changes: 1 addition & 22 deletions deps/rabbit/test/clustering_management_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,29 +484,8 @@ change_cluster_when_node_offline(Config) ->
assert_clustered([Rabbit, Hare]),
ok = start_app(Bunny),
assert_not_clustered(Bunny),
ok.

%% Now the same, but Rabbit is a RAM node, and we bring up Bunny
%% before
ok = stop_app(Rabbit),
ok = change_cluster_node_type(Rabbit, ram),
ok = start_app(Rabbit),
stop_join_start(Bunny, Hare),
assert_cluster_status(
{[Rabbit, Hare, Bunny], [Hare, Bunny], [Rabbit, Hare, Bunny]},
[Rabbit, Hare, Bunny]),
ok = stop_app(Rabbit),
ok = stop_app(Bunny),
ok = reset(Bunny),
ok = start_app(Bunny),
assert_not_clustered(Bunny),
assert_cluster_status({[Rabbit, Hare], [Hare], [Hare]}, [Hare]),
assert_cluster_status(
{[Rabbit, Hare, Bunny], [Hare, Bunny], [Hare, Bunny]},
[Rabbit]),
ok = start_app(Rabbit),
assert_cluster_status({[Rabbit, Hare], [Hare], [Rabbit, Hare]},
[Rabbit, Hare]),
assert_not_clustered(Bunny).

update_cluster_nodes(Config) ->
[Rabbit, Hare, Bunny] = cluster_members(Config),
Expand Down