Skip to content

Commit dc10074

Browse files
Merge pull request #3463 from rabbitmq/mergify/bp/v3.9.x/pr-3462
Introduce rabbit_nodes:all/0 (backport #3462)
2 parents d644976 + a6aba44 commit dc10074

14 files changed

+28
-25
lines changed

deps/rabbit/src/rabbit_amqqueue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ forget_node_for_queue(DeadNode, [H|T], Q) when ?is_amqqueue(Q) ->
17791779
node_permits_offline_promotion(Node) ->
17801780
case node() of
17811781
Node -> not rabbit:is_running(); %% [1]
1782-
_ -> All = rabbit_mnesia:cluster_nodes(all),
1782+
_ -> All = rabbit_nodes:all(),
17831783
Running = rabbit_nodes:all_running(),
17841784
lists:member(Node, All) andalso
17851785
not lists:member(Node, Running) %% [2]

deps/rabbit/src/rabbit_autoheal.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ enabled() ->
144144
end.
145145

146146
leader() ->
147-
[Leader | _] = lists:usort(rabbit_mnesia:cluster_nodes(all)),
147+
[Leader | _] = lists:usort(rabbit_nodes:all()),
148148
Leader.
149149

150150
%% This is the winner receiving its last notification that a node has
@@ -410,7 +410,7 @@ partition_value(Partition) ->
410410
%% only know which nodes we have been partitioned from, not which
411411
%% nodes are partitioned from each other.
412412
check_other_nodes(LocalPartitions) ->
413-
Nodes = rabbit_mnesia:cluster_nodes(all),
413+
Nodes = rabbit_nodes:all(),
414414
{Results, Bad} = rabbit_node_monitor:status(Nodes -- [node()]),
415415
RemotePartitions = [{Node, proplists:get_value(partitions, Res)}
416416
|| {Node, Res} <- Results],

deps/rabbit/src/rabbit_core_metrics_gc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ gc_exchanges() ->
102102
gc_process_and_entity(channel_exchange_metrics, GbSet).
103103

104104
gc_nodes() ->
105-
Nodes = rabbit_mnesia:cluster_nodes(all),
105+
Nodes = rabbit_nodes:all(),
106106
GbSet = gb_sets:from_list(Nodes),
107107
gc_entity(node_node_metrics, GbSet).
108108

deps/rabbit/src/rabbit_mnesia_rename.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ prepare(Node, NodeMapList) ->
100100

101101
%% Check that we are in the cluster, all old nodes are in the
102102
%% cluster, and no new nodes are.
103-
Nodes = rabbit_mnesia:cluster_nodes(all),
103+
Nodes = rabbit_nodes:all(),
104104
case {FromNodes -- Nodes, ToNodes -- (ToNodes -- Nodes),
105105
lists:member(Node, Nodes ++ ToNodes)} of
106106
{[], [], true} -> ok;
@@ -232,7 +232,7 @@ update_term(_NodeMap, Term) ->
232232
Term.
233233

234234
rename_in_running_mnesia(FromNode, ToNode) ->
235-
All = rabbit_mnesia:cluster_nodes(all),
235+
All = rabbit_nodes:all(),
236236
Running = rabbit_nodes:all_running(),
237237
case {lists:member(FromNode, Running), lists:member(ToNode, All)} of
238238
{false, true} -> ok;

deps/rabbit/src/rabbit_node_monitor.erl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ majority() ->
876876
majority([]).
877877

878878
majority(NodesDown) ->
879-
Nodes = rabbit_mnesia:cluster_nodes(all),
879+
Nodes = rabbit_nodes:all(),
880880
AliveNodes = alive_nodes(Nodes) -- NodesDown,
881881
length(AliveNodes) / length(Nodes) > 0.5.
882882

@@ -889,28 +889,28 @@ in_preferred_partition(PreferredNodes) ->
889889
in_preferred_partition(PreferredNodes, []).
890890

891891
in_preferred_partition(PreferredNodes, NodesDown) ->
892-
Nodes = rabbit_mnesia:cluster_nodes(all),
892+
Nodes = rabbit_nodes:all(),
893893
RealPreferredNodes = [N || N <- PreferredNodes, lists:member(N, Nodes)],
894894
AliveNodes = alive_nodes(RealPreferredNodes) -- NodesDown,
895895
RealPreferredNodes =:= [] orelse AliveNodes =/= [].
896896

897897
all_nodes_up() ->
898-
Nodes = rabbit_mnesia:cluster_nodes(all),
898+
Nodes = rabbit_nodes:all(),
899899
length(alive_nodes(Nodes)) =:= length(Nodes).
900900

901901
-spec all_rabbit_nodes_up() -> boolean().
902902

903903
all_rabbit_nodes_up() ->
904-
Nodes = rabbit_mnesia:cluster_nodes(all),
904+
Nodes = rabbit_nodes:all(),
905905
length(alive_rabbit_nodes(Nodes)) =:= length(Nodes).
906906

907-
alive_nodes() -> alive_nodes(rabbit_mnesia:cluster_nodes(all)).
907+
alive_nodes() -> alive_nodes(rabbit_nodes:all()).
908908

909909
-spec alive_nodes([node()]) -> [node()].
910910

911911
alive_nodes(Nodes) -> [N || N <- Nodes, lists:member(N, [node()|nodes()])].
912912

913-
alive_rabbit_nodes() -> alive_rabbit_nodes(rabbit_mnesia:cluster_nodes(all)).
913+
alive_rabbit_nodes() -> alive_rabbit_nodes(rabbit_nodes:all()).
914914

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

@@ -922,7 +922,7 @@ alive_rabbit_nodes(Nodes) ->
922922
-spec ping_all() -> 'ok'.
923923

924924
ping_all() ->
925-
[net_adm:ping(N) || N <- rabbit_mnesia:cluster_nodes(all)],
925+
[net_adm:ping(N) || N <- rabbit_nodes:all()],
926926
ok.
927927

928928
possibly_partitioned_nodes() ->

deps/rabbit/src/rabbit_nodes.erl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
await_running_count/2, is_single_node_cluster/0,
1515
boot/0]).
1616
-export([persistent_cluster_id/0, seed_internal_cluster_id/0, seed_user_provided_cluster_name/0]).
17-
-export([all_running_with_hashes/0]).
17+
-export([all/0, all_running_with_hashes/0]).
1818
-export([lock_id/1, lock_retries/0]).
1919

2020
-include_lib("kernel/include/inet.hrl").
@@ -137,14 +137,17 @@ set_cluster_name(Name, Username) ->
137137
ensure_epmd() ->
138138
rabbit_nodes_common:ensure_epmd().
139139

140+
-spec all() -> [node()].
141+
all() -> rabbit_mnesia:cluster_nodes(all).
142+
140143
-spec all_running() -> [node()].
141144
all_running() -> rabbit_mnesia:cluster_nodes(running).
142145

143146
-spec running_count() -> integer().
144147
running_count() -> length(all_running()).
145148

146149
-spec total_count() -> integer().
147-
total_count() -> length(rabbit_mnesia:cluster_nodes(all)).
150+
total_count() -> length(rabbit_nodes:all()).
148151

149152
-spec is_single_node_cluster() -> boolean().
150153
is_single_node_cluster() ->

deps/rabbit/src/rabbit_quorum_queue.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ start_cluster(Q) ->
176176
rabbit_data_coercion:to_atom(ra:new_uid(N))
177177
end,
178178
Id = {RaName, node()},
179-
Nodes = select_quorum_nodes(QuorumSize, rabbit_mnesia:cluster_nodes(all)),
179+
Nodes = select_quorum_nodes(QuorumSize, rabbit_nodes:all()),
180180
NewQ0 = amqqueue:set_pid(Q, Id),
181181
NewQ1 = amqqueue:set_type_state(NewQ0, #{nodes => Nodes}),
182182

@@ -440,7 +440,7 @@ handle_tick(QName,
440440
{messages_unacknowledged, MU},
441441
{reductions, R}]),
442442
ok = repair_leader_record(QName, Self),
443-
ExpectedNodes = rabbit_mnesia:cluster_nodes(all),
443+
ExpectedNodes = rabbit_nodes:all(),
444444
case Nodes -- ExpectedNodes of
445445
[] ->
446446
ok;

deps/rabbit/src/rabbit_stream_coordinator.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ maybe_resize_coordinator_cluster() ->
475475
{_, Members, _} ->
476476
MemberNodes = [Node || {_, Node} <- Members],
477477
Running = rabbit_mnesia:cluster_nodes(running),
478-
All = rabbit_mnesia:cluster_nodes(all),
478+
All = rabbit_nodes:all(),
479479
case Running -- MemberNodes of
480480
[] ->
481481
ok;

deps/rabbit/src/rabbit_stream_queue.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ make_stream_conf(Node, Q) ->
750750
InitialClusterSize = initial_cluster_size(
751751
args_policy_lookup(<<"initial-cluster-size">>,
752752
fun policy_precedence/2, Q)),
753-
Replicas0 = rabbit_mnesia:cluster_nodes(all) -- [Node],
753+
Replicas0 = rabbit_nodes:all() -- [Node],
754754
%% TODO: try to avoid nodes that are not connected
755755
Replicas = select_stream_nodes(InitialClusterSize - 1, Replicas0),
756756
Formatter = {?MODULE, format_osiris_event, [QName]},

deps/rabbit/src/rabbit_table.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ wait(TableNames, Timeout, Retries) ->
107107
ok ->
108108
ok;
109109
{timeout, BadTabs} ->
110-
AllNodes = rabbit_mnesia:cluster_nodes(all),
110+
AllNodes = rabbit_nodes:all(),
111111
{error, {timeout_waiting_for_tables, AllNodes, BadTabs}};
112112
{error, Reason} ->
113-
AllNodes = rabbit_mnesia:cluster_nodes(all),
113+
AllNodes = rabbit_nodes:all(),
114114
{error, {failed_waiting_for_tables, AllNodes, Reason}}
115115
end,
116116
case {Retries, Result} of

deps/rabbit/src/rabbit_upgrade.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ remove_backup() ->
111111
-spec maybe_upgrade_mnesia() -> 'ok'.
112112

113113
maybe_upgrade_mnesia() ->
114-
AllNodes = rabbit_mnesia:cluster_nodes(all),
114+
AllNodes = rabbit_nodes:all(),
115115
ok = rabbit_mnesia_rename:maybe_finish(AllNodes),
116116
%% Mnesia upgrade is the first upgrade scope,
117117
%% so we should create a backup here if there are any upgrades

deps/rabbitmq_management_agent/src/rabbit_mgmt_gc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ gc_exchanges() ->
105105
gc_process_and_entity(channel_exchange_stats_fine_stats, GbSet).
106106

107107
gc_nodes() ->
108-
Nodes = rabbit_mnesia:cluster_nodes(all),
108+
Nodes = rabbit_nodes:all(),
109109
GbSet = gb_sets:from_list(Nodes),
110110
gc_entity(node_stats, GbSet),
111111
gc_entity(node_coarse_stats, GbSet),

deps/rabbitmq_mqtt/src/mqtt_node.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ server_id(Node) ->
2424
{?ID_NAME, Node}.
2525

2626
all_node_ids() ->
27-
[server_id(N) || N <- rabbit_mnesia:cluster_nodes(all),
27+
[server_id(N) || N <- rabbit_nodes:all(),
2828
can_participate_in_clientid_tracking(N)].
2929

3030
start() ->

deps/rabbitmq_stream/src/rabbit_stream_sup.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ init([]) ->
5252
end}
5353
end,
5454

55-
Nodes = rabbit_mnesia:cluster_nodes(all),
55+
Nodes = rabbit_nodes:all(),
5656
OsirisConf = #{nodes => Nodes},
5757

5858
ServerConfiguration =

0 commit comments

Comments
 (0)