From: Guilhem Lettron <guilhem+github@lettron.fr>
Date: Mon, 27 May 2013 10:41:53 +0000 (+0200)
Subject: Remove mon socket in post-stop
X-Git-Tag: v0.64~48^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F322%2Fhead;p=ceph.git

Remove mon socket in post-stop

If ceph-mon segfault, socket file isn't removed.

By adding a remove in post-stop, upstart clean run directory properly.

Signed-off-by: Guilhem Lettron <guilhem@lettron.fr>
---

diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
index 17fd11b6a24d..0279f15c5a8b 100644
--- a/src/upstart/ceph-mon.conf
+++ b/src/upstart/ceph-mon.conf
@@ -24,3 +24,8 @@ export id
 #usage "cluster = name of cluster (defaults to 'ceph'); id = monitor instance id"
 
 exec /usr/bin/ceph-mon --cluster="${cluster:-ceph}" -i "$id" -f
+
+post-stop script
+    # Cleanup socket in case of segfault
+    rm -f "/var/run/ceph/ceph-mon.$id.asok"
+end script