From: Alexey Lebedeff <alebedev@mirantis.com>
Date: Thu, 10 Dec 2015 16:40:38 +0000 (+0300)
Subject: Backport upstream fix for management plugin
X-Git-Tag: mos-9.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F94%2F14594%2F2;p=packages%2Ftrusty%2Frabbitmq-server.git

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 83a7f52..2ee9d61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (3.5.6-1~u14.04+mos3) mos8.0; urgency=medium
+
+  * Backport https://github.com/rabbitmq/rabbitmq-management/pull/84
+
+ -- Alexey Lebedeff <alebedev@mirantis.com>  Fri, 11 Dec 2015 14:31:08 +0300
+
 rabbitmq-server (3.5.6-1~u14.04+mos2) mos8.0; urgency=medium
 
   * Backport https://github.com/rabbitmq/rabbitmq-common/pull/18
diff --git a/debian/patches/fix-management-startup-after-split.diff b/debian/patches/fix-management-startup-after-split.diff
new file mode 100644
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
index a2227a7..f735084 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-pmon-demonitor-function.diff
+fix-management-startup-after-split.diff