diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-09-23 14:40:03 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-09-23 14:40:03 +0100 |
| commit | ee34fbf0e6e97195ed475784349f7f1fa2aeacd0 (patch) | |
| tree | 52e34018461adb1408a88dd9894f5cbfc75c0e50 /src | |
| parent | de9ef21fb0e34acf70116c6e4994fa13d7afbeb3 (diff) | |
| download | rabbitmq-server-git-ee34fbf0e6e97195ed475784349f7f1fa2aeacd0.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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mnesia.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 5fa29b7ea3..71d9a47ee1 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 |