ceph-disk-activate, upstart: Use "initctl emit" to start OSDs.

This avoids an error if the daemon was running already, and is
already being done with the other services.

Signed-off-by: Tommi Virtanen <tv@inktank.com>

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index 17e520dde222e058ce562333607adc3cb20bc5d7..225e2a664ea9b36a5c3ddda592b01d8cf972d88b 100755 (executable)
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -276,7 +276,9 @@ def upstart_start(
     subprocess.check_call(
         args=[
             'initctl',
-            'start',
+            # use emit, not start, because start would fail if the
+            # instance was already running
+            'emit',
             # since the daemon starting doesn't guarantee much about
             # the service being operational anyway, don't bother
             # waiting for it

diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
index 7a976c2397a427f42ff858bda789ca5f1e383eb9..119ad000fc49be82bda3b5abb1a6319bc54b8073 100644 (file)
--- a/src/upstart/ceph-osd.conf
+++ b/src/upstart/ceph-osd.conf
@@ -1,5 +1,6 @@
 description "Ceph OSD"
 
+start on ceph-osd
 stop on runlevel [!2345]
 
 respawn