Skip to content

Commit

Permalink
Refactor: introduce alive_nodes/0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon MacMullen committed Sep 29, 2014
1 parent d73fafd commit 9ab05b0
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/rabbit_node_monitor.erl
Expand Up @@ -373,7 +373,7 @@ handle_info(ping_down_nodes_again, State) ->
handle_info(ping_up_nodes, State) ->
%% In this case we need to ensure that we ping "quickly" -
%% i.e. only nodes that we know to be up.
Nodes = alive_nodes(rabbit_mnesia:cluster_nodes(all)) -- [node()],
Nodes = alive_nodes() -- [node()],
[gen_server2:cast({?MODULE, N}, keepalive) || N <- Nodes],
{noreply, ensure_keepalive_timer(State#state{keepalive_timer = undefined})};

Expand Down Expand Up @@ -526,16 +526,15 @@ del_node(Node, Nodes) -> Nodes -- [Node].
%% connect to nodes which are currently disconnected.

majority() ->
Nodes = rabbit_mnesia:cluster_nodes(all),
length(alive_nodes(Nodes)) / length(Nodes) > 0.5.
length(alive_nodes()) / length(Nodes) > 0.5.

all_nodes_up() ->
Nodes = rabbit_mnesia:cluster_nodes(all),
length(alive_nodes(Nodes)) =:= length(Nodes).
length(alive_nodes()) =:= length(Nodes).

all_rabbit_nodes_up() ->
Nodes = rabbit_mnesia:cluster_nodes(all),
length(alive_rabbit_nodes(Nodes)) =:= length(Nodes).
length(alive_rabbit_nodes()) =:= length(Nodes).

alive_nodes() -> alive_nodes(rabbit_mnesia:cluster_nodes(all)).

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

Expand Down

0 comments on commit 9ab05b0

Please sign in to comment.