Skip to content

Peer discovery cleanup: be more defensive (backport #12809) #12811

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 2 commits into from
Nov 25, 2024
Merged

Peer discovery cleanup: be more defensive (backport #12809) #12811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12b8229
Peer discovery cleanup: be more defensive
michaelklishin Nov 25, 2024
7e83a93
Refactor: as_list/1 belongs to rabbit_data_coercion
michaelklishin Nov 25, 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
7 changes: 7 additions & 0 deletions deps/rabbit_common/src/rabbit_data_coercion.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-export([to_binary/1, to_list/1, to_atom/1, to_integer/1, to_proplist/1, to_map/1]).
-export([to_atom/2, atomize_keys/1, to_list_of_binaries/1]).
-export([to_utf8_binary/1, to_unicode_charlist/1]).
-export([as_list/1]).

-spec to_binary(Val :: binary() | list() | atom() | integer() | function()) -> binary().
to_binary(Val) when is_list(Val) -> list_to_binary(Val);
Expand Down Expand Up @@ -109,3 +110,9 @@ to_unicode_charlist(Val) ->
UnicodeValue ->
UnicodeValue
end.

-spec as_list(list() | any()) -> [any()].
as_list(Nodes) when is_list(Nodes) ->
Nodes;
as_list(Other) ->
[Other].
7 changes: 5 additions & 2 deletions deps/rabbitmq_peer_discovery_common/src/rabbit_peer_discovery_cleanup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
-compile(export_all).
-endif.

-import(rabbit_data_coercion, [as_list/1]).

-define(CONFIG_MODULE, rabbit_peer_discovery_config).
-define(CONFIG_KEY, node_cleanup).

Expand Down Expand Up @@ -241,7 +243,7 @@ maybe_cleanup(State, UnreachableNodes) ->
"Peer discovery: cleanup discovered unreachable nodes: ~tp",
[UnreachableNodes],
#{domain => ?RMQLOG_DOMAIN_PEER_DIS}),
case lists:subtract(UnreachableNodes, service_discovery_nodes()) of
case lists:subtract(as_list(UnreachableNodes), as_list(service_discovery_nodes())) of
[] ->
?LOG_DEBUG(
"Peer discovery: all unreachable nodes are still "
Expand Down Expand Up @@ -304,7 +306,8 @@ unreachable_nodes() ->
service_discovery_nodes() ->
Module = rabbit_peer_discovery:backend(),
case rabbit_peer_discovery:normalize(Module:list_nodes()) of
{ok, {Nodes, _Type}} ->
{ok, {OneOrMultipleNodes, _Type}} ->
Nodes = as_list(OneOrMultipleNodes),
?LOG_DEBUG(
"Peer discovery cleanup: ~tp returned ~tp",
[Module, Nodes],
Expand Down
Loading