ceph-disk: use async upstart job for trigger

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 502f83a014fc48bed6f8a7dc3d083d97a1391a3d..6ba07195a55eea5a13e0dbecf330025791fcc391 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,7 @@ EXTRA_DIST += \
        $(srcdir)/ceph-rbdnamer \
        $(srcdir)/tools/ceph-monstore-update-crush.sh \
        $(srcdir)/upstart/ceph-all.conf \
+       $(srcdir)/upstart/ceph-disk.conf \
        $(srcdir)/upstart/ceph-mon.conf \
        $(srcdir)/upstart/ceph-mon-all.conf \
        $(srcdir)/upstart/ceph-mon-all-starter.conf \

diff --git a/src/ceph-disk b/src/ceph-disk
index 2015a0c48652f2b8a9a0df6c220dfbee3a22b955..b04c54bd5e8fa1cc392a4177216b81a0d07e5e03 100755 (executable)
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -3030,6 +3030,18 @@ def main_trigger(args):
             ]
         )
         return
+    if is_upstart() and not args.sync:
+        LOG.info('upstart detected, triggering ceph-disk task')
+        command(
+            [
+                'initctl',
+                'emit',
+                'ceph-disk',
+                'dev={dev}'.format(dev=args.dev),
+                'pid={pid}'.format(pid=os.getpid()),
+            ]
+        )
+        return
 
     parttype = get_partition_type(args.dev)
     partid = get_partition_uuid(args.dev)

diff --git a/src/upstart/ceph-disk.conf b/src/upstart/ceph-disk.conf
new file mode 100644 (file)
index 0000000..a388785
--- /dev/null
+++ b/src/upstart/ceph-disk.conf
@@ -0,0 +1,9 @@
+description "ceph-disk async worker"
+
+start on ceph-disk
+
+instance $dev/$pid
+export dev
+export pid
+
+exec ceph-disk --verbose --log-stdout trigger --sync $dev