Skip to content

Peer discovery core logic rewrite follow-up improvements #10073

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.

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 4 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_mnesia.erl
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ init() ->
%% Peer discovery may have been a no-op if it decided that all other nodes
%% should join this one. Therefore, we need to look at if this node is
%% still virgin and finish our init of Mnesia accordingly. In particular,
%% this second part crates all our Mnesia tables.
%% this second part creates all our Mnesia tables.
case is_virgin_node() of
true ->
init_db_and_upgrade([node()], disc, true, _Retry = true);
Expand Down
29 changes: 19 additions & 10 deletions deps/rabbit/src/rabbit_peer_discovery.erl
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ lock_acquisition_failure_mode() ->

maybe_init() ->
Backend = backend(),
?LOG_DEBUG(
?LOG_INFO(
"Peer discovery: configured backend: ~tp",
[Backend],
#{domain => ?RMQLOG_DOMAIN_PEER_DISC}),
Expand Down Expand Up @@ -387,9 +387,11 @@ query_node_props(Nodes) when Nodes =/= [] ->
"discovered peers properties",
[Peer],
#{domain => ?RMQLOG_DOMAIN_PEER_DISC}),
Ret = erpc:call(Peer, ?MODULE, do_query_node_props, [Nodes]),
peer:stop(Pid),
Ret;
try
erpc:call(Peer, ?MODULE, do_query_node_props, [Nodes])
after
peer:stop(Pid)
end;
{error, _} = Error ->
?LOG_ERROR(
"Peer discovery: failed to start temporary hidden node to "
Expand Down Expand Up @@ -448,10 +450,12 @@ do_query_node_props(Nodes) when Nodes =/= [] ->

with_group_leader_proxy(ProxyGroupLeader, Fun) ->
UpstreamGroupLeader = erlang:group_leader(),
true = erlang:group_leader(ProxyGroupLeader, self()),
Ret = Fun(),
true = erlang:group_leader(UpstreamGroupLeader, self()),
Ret.
try
true = erlang:group_leader(ProxyGroupLeader, self()),
Fun()
after
true = erlang:group_leader(UpstreamGroupLeader, self())
end.

group_leader_proxy(Parent, UpstreamGroupLeader) ->
receive
Expand Down Expand Up @@ -511,7 +515,12 @@ query_node_props2([], NodesAndProps, ProxyGroupLeader) ->
NodesAndProps2 = sort_nodes_and_props(NodesAndProps1),
%% Wait for the proxy group leader to flush its inbox.
ProxyGroupLeader ! stop_proxy,
receive proxy_stopped -> ok end,
receive
proxy_stopped ->
ok
after 120_000 ->
ok
end,
NodesAndProps2.

-spec get_node_start_time(Node, Unit, ProxyGroupLeader) -> StartTime when
Expand Down Expand Up @@ -678,7 +687,7 @@ can_use_discovered_nodes(DiscoveredNodes, NodesAndProps)

ThisNodeIsIncluded andalso HasEnoughNodes;
can_use_discovered_nodes(_DiscoveredNodes, []) ->
?LOG_DEBUG(
?LOG_INFO(
"Peer discovery: discovered no peer nodes to cluster with. "
"Some discovery backends can filter nodes out based on a "
"readiness criteria. "
Expand Down