From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 22 Aug 2016 09:52:45 +0000 (+0200)
Subject: ceph-osd-prestart.sh: check existence of OSD data directory
X-Git-Tag: v10.2.4~97^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=29a87012f560c213e34b893cd8dd9dedfd0b11da;p=ceph.git

ceph-osd-prestart.sh: check existence of OSD data directory

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

diff --git a/src/ceph-osd-prestart.sh b/src/ceph-osd-prestart.sh
index 314ea182397..e68565e904f 100644
--- a/src/ceph-osd-prestart.sh
+++ b/src/ceph-osd-prestart.sh
@@ -18,6 +18,13 @@ if [ -z "$id"  ]; then
 fi
 
 data="/var/lib/ceph/osd/${cluster:-ceph}-$id"
+
+# assert data directory exists - see http://tracker.ceph.com/issues/17091
+if [ ! -d "$data" ]; then
+    echo "OSD data directory $data does not exist; bailing out." 1>&2
+    exit 1
+fi
+
 journal="$data/journal"
 
 update="$(ceph-conf --cluster=${cluster:-ceph} --name=osd.$id --lookup osd_crush_update_on_start || :)"