diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-03-22 13:43:07 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-03-22 13:43:07 +0000 |
| commit | 182e79897974f410d16bab9bfdd96d8135419e2d (patch) | |
| tree | 87c489095828db2a4944a0b2f262d3e2a4198840 /src | |
| parent | 9b8ca7c15dd1ec0402dc4f9f989a4ec60907c4cc (diff) | |
| download | rabbitmq-server-git-182e79897974f410d16bab9bfdd96d8135419e2d.tar.gz | |
Backout e2d962df4128 until we can make that work properly...
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_node_monitor.erl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 3872f3dfa2..de53b7f0b3 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -318,9 +318,6 @@ 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", []), @@ -349,7 +346,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_rabbit_nodes()) of + Partitions1 = case Partitions -- (Partitions -- alive_nodes()) of [] -> []; _ -> Partitions end, |