[Pkg-ceph-commits] [ceph] 01/01: Start ceph-all after static-network-up (LP: #1636322).

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch ubuntu/xenial
in repository ceph.

commit b1a3b048a3c7981a0e96c104d843d6423fcf4108
Author: James Page <james.page at ubuntu.com>
Date:   Thu Apr 20 09:07:50 2017 +0100

    Start ceph-all after static-network-up (LP: #1636322).
---
 debian/changelog                                  |  9 ++++++
 debian/patches/series                             |  1 +
 debian/patches/start-ceph-all-after-network.patch | 37 +++++++++++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 999c7be..7bacb37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ceph (10.2.6-0ubuntu0.16.04.2) UNRELEASED; urgency=medium
+
+  [ Billy Olsen ]
+  * Start ceph-all after static-network-up (LP: #1636322):
+    - d/p/start-ceph-all-after-network.patch: add dependency on
+      the static-network-up event before starting ceph-all.
+
+ -- James Page <james.page at ubuntu.com>  Thu, 20 Apr 2017 09:05:51 +0100
+
 ceph (10.2.6-0ubuntu0.16.04.1) xenial; urgency=medium
 
   * New upstream stable point release (LP: #1671117):
diff --git a/debian/patches/series b/debian/patches/series
index 5533f3f..fe2b824 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix-argparse-defaults.patch
 fix-cycles-arch.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
+start-ceph-all-after-network.patch
diff --git a/debian/patches/start-ceph-all-after-network.patch b/debian/patches/start-ceph-all-after-network.patch
new file mode 100644
index 0000000..28e35a4
--- /dev/null
+++ b/debian/patches/start-ceph-all-after-network.patch
@@ -0,0 +1,37 @@
+From e10e22a95f67c31947d4c0f33d69e4d8b929b0e8 Mon Sep 17 00:00:00 2001
+From: Billy Olsen <billy.olsen at gmail.com>
+Date: Mon, 24 Oct 2016 15:13:51 -0700
+Forwarded: https://github.com/ceph/ceph/pull/11631
+Subject: [PATCH 1/1] upstart: start ceph-all after static-network-up
+
+Starting on runlevel [2345] allows the ceph services to
+start before all of the networking is configured. This
+introduces a race condition which allows a service to start
+before the network it binds to is available.
+
+Add the static-network-up event as a dependency for the start
+on directive in order to start the ceph services after all of
+the network stanzas have been processed and executed in the
+/etc/network/interfaces and /etc/network/interfaces.d/*.conf
+files.
+
+Fixes: http://tracker.ceph.com/issues/17689
+
+Signed-off-by: Billy Olsen <billy.olsen at gmail.com>
+---
+ src/upstart/ceph-all.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/upstart/ceph-all.conf b/src/upstart/ceph-all.conf
+index c0b0edd..52d0f08 100644
+--- a/src/upstart/ceph-all.conf
++++ b/src/upstart/ceph-all.conf
+@@ -1,4 +1,4 @@
+ description "Ceph"
+ 
+-start on runlevel [2345]
++start on runlevel [2345] and static-network-up
+ stop on runlevel [!2345]
+-- 
+2.7.4
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git