diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-03-21 12:27:47 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-03-21 12:27:47 +0000 |
| commit | 21608266fad873775822c7066de939ed50dddf63 (patch) | |
| tree | 9706c3be8ea513b4c072da39609bc1c596ce2176 /src | |
| parent | 44cf515f9087cfd32da40dcbc79ecfe414018f6a (diff) | |
| parent | 4a9bc15f0705abafcdc5b31359a9de4dda29acfb (diff) | |
| download | rabbitmq-server-git-21608266fad873775822c7066de939ed50dddf63.tar.gz | |
Merge heads
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_node_monitor.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index de53b7f0b3..3872f3dfa2 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -318,6 +318,9 @@ alive_nodes() -> Nodes = rabbit_mnesia:cluster_nodes(all), [N || N <- Nodes, pong =:= net_adm:ping(N)]. +alive_rabbit_nodes() -> + [N || N <- alive_nodes(), rabbit_nodes:is_running(N, rabbit)]. + await_cluster_recovery() -> rabbit_log:warning("Cluster minority status detected - awaiting recovery~n", []), @@ -346,7 +349,7 @@ handle_dead_rabbit_state(State = #state{partitions = Partitions}) -> %% that we do not attempt to deal with individual (other) partitions %% going away. It's only safe to forget anything about partitions when %% there are no partitions. - Partitions1 = case Partitions -- (Partitions -- alive_nodes()) of + Partitions1 = case Partitions -- (Partitions -- alive_rabbit_nodes()) of [] -> []; _ -> Partitions end, |