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 | e1681753f9c7aaa30d196e3229716040f701b51c (patch) | |
| tree | 131c83b760df3957a66006c9e1e66ea3524273a3 /src | |
| parent | e6cd73e32bc88fe464cdc9a285d15c5104b5032f (diff) | |
| download | rabbitmq-server-git-e1681753f9c7aaa30d196e3229716040f701b51c.tar.gz | |
A node counts as down if it is not running rabbit in this case.
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, |