summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-10-09 16:31:19 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-10-09 16:31:19 +0100
commit125bf75ba5032aea477f795d03e8d706c9600685 (patch)
tree749d1ff68ac3cb525dca8466460ab1a551228bf1
parent61e786037e71bf9940bd2309582b2026fde74f57 (diff)
downloadrabbitmq-server-125bf75ba5032aea477f795d03e8d706c9600685.tar.gz
Check Mnesia's idea of which nodes are running; avoid infinite loop.
-rw-r--r--src/rabbit_node_monitor.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index fdda6252..b4e87f75 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -411,7 +411,8 @@ handle_info({nodedown, Node, Info}, State = #state{node_guids = GUIDs}) ->
Node, DownGUID, node(), CheckGUID})
end,
case orddict:find(Node, GUIDs) of
- {ok, DownGUID} -> Alive = alive_nodes() -- [node(), Node],
+ {ok, DownGUID} -> Alive = rabbit_mnesia:cluster_nodes(running)
+ -- [node(), Node],
[case orddict:find(N, GUIDs) of
{ok, CheckGUID} -> Check(N, CheckGUID, DownGUID);
error -> ok