From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 12 Feb 2012 00:39:27 +0000 (-0800)
Subject: mds: remove pidfile
X-Git-Tag: v0.43~84
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=395dc659b93220b3a83d89de894f54ed5aa1f6fe;p=ceph.git

mds: remove pidfile

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

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 0330cd1ab26..de887716adf 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -34,11 +34,13 @@ using namespace std;
 #include "msg/SimpleMessenger.h"
 
 #include "common/Timer.h"
-#include "global/global_init.h"
-#include "global/signal_handler.h"
 #include "common/ceph_argparse.h"
 #include "common/pick_address.h"
 
+#include "global/global_init.h"
+#include "global/signal_handler.h"
+#include "global/pidfile.h"
+
 #include "mon/MonClient.h"
 
 #include "auth/KeyRing.h"
@@ -294,6 +296,8 @@ int main(int argc, const char **argv)
   mds->mds_lock.Lock();
   mds->mds_lock.Unlock();
 
+  pidfile_remove();
+
   // only delete if it was a clean shutdown (to aid memory leak
   // detection, etc.).  don't bother if it was a suicide.
   if (mds->is_stopped())