]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
upstart: fail osd start if crush update fails 772/head
authorSage Weil <sage@inktank.com>
Mon, 28 Oct 2013 22:56:36 +0000 (15:56 -0700)
committerSage Weil <sage@inktank.com>
Mon, 28 Oct 2013 22:58:29 +0000 (15:58 -0700)
If the update for the CRUSH position fails for some reason, do not
start the OSD.

Signed-off-by: Sage Weil <sage@inktank.com>
src/upstart/ceph-osd.conf

index c0bf4d68c1cb1875cb258816d3d825b06ce31cbd..ab6af5835e0ddbeb0ba76925e24ae1bc18e5ab52 100644 (file)
@@ -32,8 +32,7 @@ pre-start script
            "${weight:-${defaultweight:-1}}" \
            root=default \
            host="$(hostname -s)" \
-           $location \
-           || :
+           $location
     fi
 
     journal="/var/lib/ceph/osd/${cluster:-ceph}-$id/journal"