ceph-disk: upstart must not run ceph-disk activate concurrently

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/src/upstart/ceph-disk.conf b/src/upstart/ceph-disk.conf
index a388785f50849d1275b746ce00468017db6c1d1a..558c1f5fd8a83f9e1329a4bb208b58ea7889ac1c 100644 (file)
--- a/src/upstart/ceph-disk.conf
+++ b/src/upstart/ceph-disk.conf
@@ -6,4 +6,5 @@ instance $dev/$pid
 export dev
 export pid
 
-exec ceph-disk --verbose --log-stdout trigger --sync $dev
+exec flock /var/lock/ceph-disk -c 'ceph-disk --verbose --log-stdout trigger --sync $dev'
+