summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-09-23 14:40:03 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-09-23 14:40:03 +0100
commit6c338f1ba2f59e77b72105fe173d36a16f2292dd (patch)
tree52e34018461adb1408a88dd9894f5cbfc75c0e50
parent9affd59cdf7f2dcebcddfdf614bcc0da7d7e7fbd (diff)
downloadrabbitmq-server-6c338f1ba2f59e77b72105fe173d36a16f2292dd.tar.gz
node_type() should check the cluster status file rather than ask Mnesia - in the early stages of RAM node startup Mnesia might tell us we are a standalone disc node.
-rw-r--r--src/rabbit_mnesia.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 5fa29b7e..71d9a47e 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -399,7 +399,8 @@ node_info() ->
delegate_beam_hash(), cluster_status_from_mnesia()}.
node_type() ->
- DiscNodes = cluster_nodes(disc),
+ {_AllNodes, DiscNodes, _RunningNodes} =
+ rabbit_node_monitor:read_cluster_status(),
case DiscNodes =:= [] orelse me_in_nodes(DiscNodes) of
true -> disc;
false -> ram