summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-12 16:00:45 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-08-12 16:00:45 +0100
commit45ed25d145f76edd863baf960c2b4a43a319c4e4 (patch)
tree83b41ca442d403e199fb4eb7f3259f26dfbc9ae8
parent93fe43622a4bcfede8ad731e811df4b8bea67748 (diff)
downloadrabbitmq-server-git-45ed25d145f76edd863baf960c2b4a43a319c4e4.tar.gz
warn when the last *running* disc node goes down
As opposed to when the only disc node goes down.
-rw-r--r--src/rabbit_mnesia.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl
index 32ac36411e..fb6fdc6689 100644
--- a/src/rabbit_mnesia.erl
+++ b/src/rabbit_mnesia.erl
@@ -703,7 +703,7 @@ wait_for_tables(TableNames) ->
reset(Force) ->
ensure_mnesia_not_running(),
case not Force andalso is_only_disc_node(node(), false) of
- true -> log_both("resetting only disc node");
+ true -> log_both("no other disc nodes running");
false -> ok
end,
Node = node(),
@@ -764,12 +764,13 @@ on_node_up(Node) ->
on_node_down(Node) ->
case is_only_disc_node(Node, true) of
- true -> log_both("only disc node went down");
+ true -> log_both("only disc running node went down");
false -> ok
end.
is_only_disc_node(Node, _MnesiaRunning = true) ->
- [Node] =:= nodes_of_type(disc_copies);
+ OfflineDiscNodes = nodes_of_type(disc_copies) -- running_clustered_nodes(),
+ [Node] =:= nodes_of_type(disc_copies) -- OfflineDiscNodes;
is_only_disc_node(Node, false) ->
start_mnesia(),
Res = is_only_disc_node(Node, true),