diff options
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | src/rabbit_node_monitor.erl | 18 |
2 files changed, 13 insertions, 7 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index d08d502b42..339fa69eae 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -44,7 +44,7 @@ {log_levels, [{connection, info}]}, {ssl_cert_login_from, distinguished_name}, {reverse_dns_lookups, false}, - {cluster_cp_mode, false}, + {cluster_partition_handling, ignore}, {tcp_listen_options, [binary, {packet, raw}, {reuseaddr, true}, diff --git a/src/rabbit_node_monitor.erl b/src/rabbit_node_monitor.erl index ad2003a575..5d5879774f 100644 --- a/src/rabbit_node_monitor.erl +++ b/src/rabbit_node_monitor.erl @@ -271,12 +271,18 @@ handle_dead_rabbit(Node) -> ok = rabbit_amqqueue:on_node_down(Node), ok = rabbit_alarm:on_node_down(Node), ok = rabbit_mnesia:on_node_down(Node), - case application:get_env(rabbit, cluster_cp_mode) of - {ok, true} -> case majority() of - true -> ok; - false -> await_cluster_recovery() - end; - {ok, false} -> ok + case application:get_env(rabbit, cluster_partition_handling) of + {ok, pause_minority} -> + case majority() of + true -> ok; + false -> await_cluster_recovery() + end; + {ok, ignore} -> + ok; + {ok, Term} -> + rabbit_log:warning("cluster_partition_handling ~p unrecognised, " + "assuming 'ignore'~n", [Term]), + ok end, ok. |