From: Sage Weil <sage@redhat.com>
Date: Thu, 3 Sep 2015 21:01:21 +0000 (-0400)
Subject: ceph-disk: use async upstart job for trigger
X-Git-Tag: v9.1.0~162^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f974a3e54168eae7b6ad0934c25cf703d43cbac;p=ceph.git

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 502f83a014fc4..6ba07195a55ee 100644
--- 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 2015a0c48652f..b04c54bd5e8fa 100755
--- 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
index 0000000000000..a388785f50849
--- /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