diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-03-19 17:41:53 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-03-19 17:41:53 +0000 |
| commit | 00eb6aefa5f0bdacad56aeacd53420a86a479350 (patch) | |
| tree | 131c83b760df3957a66006c9e1e66ea3524273a3 | |
| parent | d8baacd25557f3bee697dd867bd3c32e1d1ba874 (diff) | |
| download | rabbitmq-server-00eb6aefa5f0bdacad56aeacd53420a86a479350.tar.gz | |
A node counts as down if it is not running rabbit in this case.
| -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 de53b7f0..3872f3df 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, |