Backport upstream fix for management plugin

https://github.com/rabbitmq/rabbitmq-management/pull/84

Without this fix node may fail to start after network split.

Change-Id: I901055ea89b88edbbfa5350186ce3ad2d4bc71fb
Closes-Bug: #1513511

diff --git a/debian/changelog b/debian/changelog
index 31751f93a74992019ed113215c635f4c50b6af54..24eb81b1cea43767ceda32d1bbec5e4a1b2fdf39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rabbitmq-server (3.5.4-1~u14.04+mos3) mos7.0; urgency=medium
+
+  * Backport upstream fix for management plugin
+    https://github.com/rabbitmq/rabbitmq-management/pull/84 
+
+ -- Denis Puchkin <dpuchkin@mirantis.com>  Tue, 22 Dec 2015 18:58:55 +0300
+
 rabbitmq-server (3.5.4-1~u14.04+mos2) mos7.0; urgency=medium
 
   * Fall back to original MOS 7.0 package

diff --git a/debian/patches/fix-management-startup-after-split.diff b/debian/patches/fix-management-startup-after-split.diff
new file mode 100644 (file)
index 0000000..252e893
--- /dev/null
+++ b/debian/patches/fix-management-startup-after-split.diff
@@ -0,0 +1,20 @@
+Description: Backport management plugin fix
+ Backport management plugin fix for bug that prevented node from starting after network split.
+Author: Alexey Lebedeff <alebedev@mirantis.com>
+Origin: backport, https://github.com/rabbitmq/rabbitmq-management/pull/84
+Bug: https://github.com/rabbitmq/rabbitmq-management/issues/81
+Applied-Upstream: 3.5.7
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl
++++ b/plugins-src/rabbitmq-management/src/rabbit_mgmt_sup_sup.erl
+@@ -57,7 +57,8 @@ start_child() -> supervisor2:start_child
+ %%----------------------------------------------------------------------------
+ 
+ init([]) ->
+-    {ok, {{one_for_one, 0, 1}, [sup()]}}.
++    timer:apply_after(0, ?MODULE, start_child, []),
++    {ok, {{one_for_one, 0, 1}, []}}.
+ 
+ sup() ->
+     {rabbit_mgmt_sup, {rabbit_mgmt_sup, start_link, []},

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..970b278
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-management-startup-after-split.diff