diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-11 12:24:11 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-11 12:24:11 +0000 |
| commit | 442cc36f9f76d73f5af8e5c33a223fa8648521b0 (patch) | |
| tree | 038ecaa439c0b5e4c5031fedd966a1c4d596eb6b | |
| parent | 55c2a86fd2eda42e307e1ac741ee8bb94f92707e (diff) | |
| parent | b6658c32427ca90f0b63bcced03ea158ef412e94 (diff) | |
| download | rabbitmq-server-git-442cc36f9f76d73f5af8e5c33a223fa8648521b0.tar.gz | |
stable to default
| -rw-r--r-- | src/rabbit_node_monitor.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index 46dbd7b7a1..b9a7b44182 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -344,9 +344,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} -> |