From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 13 Jun 2016 08:27:18 +0000 (+0200)
Subject: ceph-osd-prestart.sh: drop Upstart-specific code
X-Git-Tag: v10.2.3~56^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b26acc03ab42ba7eacb804ef8dc08c03a6e64e2d;p=ceph.git

ceph-osd-prestart.sh: drop Upstart-specific code

Before this patch, the ceph-osd-prestart.sh script would do Upstart-specific
things if the journal device failed to appear after a 5-second timeout.

Fixes: http://tracker.ceph.com/issues/15984
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 47a06e608b7f686252d42c5a879373d8ebb65d9d)
---

diff --git a/src/ceph-osd-prestart.sh b/src/ceph-osd-prestart.sh
index cefca854e61..314ea182397 100644
--- a/src/ceph-osd-prestart.sh
+++ b/src/ceph-osd-prestart.sh
@@ -45,13 +45,11 @@ fi
 if [ -L "$journal" -a ! -e "$journal" ]; then
     udevadm settle --timeout=5 || :
     if [ -L "$journal" -a ! -e "$journal" ]; then
-        echo "ceph-osd($UPSTART_INSTANCE): journal not present, not starting yet." 1>&2
-        stop
+        echo "ceph-osd(${cluster:-ceph}-$id): journal not present, not starting yet." 1>&2
         exit 0
     fi
 fi
 
-
 # ensure ownership is correct
 owner=`stat -c %U $data/.`
 if [ $owner != 'ceph' -a $owner != 'root' ]; then