summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-03-11 12:23:38 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-03-11 12:23:38 +0000
commitc9a70195d9bd435e65a09660f601851f7c5f4b46 (patch)
tree1be3c3e263264ddaea70fa2dcbd9612e744bc422
parentfbe07279731c29c36ce2f637eba5cb58800b7266 (diff)
downloadrabbitmq-server-bug26063.tar.gz
Don't corrupt the node montor state even if we are about to shut down.bug26063
-rw-r--r--src/rabbit_node_monitor.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl
index 56134621..506e945f 100644
--- a/src/rabbit_node_monitor.erl
+++ b/src/rabbit_node_monitor.erl
@@ -353,9 +353,10 @@ handle_dead_node(Node, State = #state{autoheal = Autoheal}) ->
case application:get_env(rabbit, cluster_partition_handling) of
{ok, pause_minority} ->
case majority() of
- true -> State;
- false -> await_cluster_recovery() %% Does not really return
- end;
+ true -> ok;
+ false -> await_cluster_recovery()
+ end,
+ State;
{ok, ignore} ->
State;
{ok, autoheal} ->