Rename 'autoheal' option

This way autoheal will be disabled even if fuel-library specifies
otherwise.

Change-Id: I2cbfa9465320bb6e05e7c6c860383637339957e6

diff --git a/debian/changelog b/debian/changelog
index a3a23716042f494262eea7ee8a5b5bad0785fff8..163612352c75d4889e8831605877c5df98afd6c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.6.6-1~u14.04+mos3) mos7.0-hotfix; urgency=medium
+
+  * Rename 'autoheal' option, so it'll not be enabled by fuel-library.
+
+ -- Alexey Lebedeff <alebedev@mirantis.com>  Wed, 30 Nov 2016 14:50:43 +0300
+
 rabbitmq-server (3.6.6-1~u14.04+mos2) mos7.0-hotfix; urgency=medium
 
   * Use HiPE-compilation

diff --git a/debian/patches/disable_autoheal.patch b/debian/patches/disable_autoheal.patch
new file mode 100644 (file)
index 0000000..7190644
--- /dev/null
+++ b/debian/patches/disable_autoheal.patch
@@ -0,0 +1,32 @@
+--- a/deps/rabbit/src/rabbit_autoheal.erl
++++ b/deps/rabbit/src/rabbit_autoheal.erl
+@@ -147,8 +147,8 @@ maybe_start(State) ->
+ 
+ enabled() ->
+     case application:get_env(rabbit, cluster_partition_handling) of
+-        {ok, autoheal}                         -> true;
+-        {ok, {pause_if_all_down, _, autoheal}} -> true;
++        {ok, really_autoheal}                         -> true;
++        {ok, {pause_if_all_down, _, really_autoheal}} -> true;
+         _                                      -> false
+     end.
+ 
+--- a/deps/rabbit/src/rabbit_node_monitor.erl
++++ b/deps/rabbit/src/rabbit_node_monitor.erl
+@@ -662,13 +662,15 @@ handle_dead_node(Node, State = #state{au
+                            fun in_preferred_partition/0)
+             end,
+             case HowToRecover of
+-                autoheal -> State#state{autoheal =
++                really_autoheal -> State#state{autoheal =
+                               rabbit_autoheal:node_down(Node, Autoheal)};
+                 _        -> State
+             end;
+         {ok, ignore} ->
+             State;
+         {ok, autoheal} ->
++            State;
++        {ok, really_autoheal} ->
+             State#state{autoheal = rabbit_autoheal:node_down(Node, Autoheal)};
+         {ok, Term} ->
+             rabbit_log:warning("cluster_partition_handling ~p unrecognised, "

diff --git a/debian/patches/series b/debian/patches/series
index 6dce3bfc469a1c34a7450e8708b5cf683fa3377f..f67a55b27bc5fb1dad28ff486790b881e57f822a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 revert_private_attributes.patch
 policy_location.patch
 native-code-location.patch
+disable_autoheal.patch