From 47a06e608b7f686252d42c5a879373d8ebb65d9d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 13 Jun 2016 10:27:18 +0200 Subject: [PATCH] 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 --- src/ceph-osd-prestart.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ceph-osd-prestart.sh b/src/ceph-osd-prestart.sh index c5b99d53c69..ea6666540bb 100644 --- a/src/ceph-osd-prestart.sh +++ b/src/ceph-osd-prestart.sh @@ -23,13 +23,11 @@ journal="$data/journal" 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 -- 2.47.3