From: Sage Weil <sage@redhat.com>
Date: Sat, 11 Apr 2015 00:13:09 +0000 (-0700)
Subject: osd: drop dead suicide() code
X-Git-Tag: v9.1.0~324^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff4c4cc7013431174222007cdaf31f557fc58069;p=ceph.git

osd: drop dead suicide() code

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index bdfb7502f404..edecdca988b4 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1604,7 +1604,6 @@ void OSD::handle_signal(int signum)
 {
   assert(signum == SIGINT || signum == SIGTERM);
   derr << "*** Got signal " << sys_siglist[signum] << " ***" << dendl;
-  //suicide(128 + signum);
   shutdown();
 }
 
@@ -2254,33 +2253,6 @@ void OSD::create_recoverystate_perf()
   cct->get_perfcounters_collection()->add(recoverystate_perf);
 }
 
-void OSD::suicide(int exitcode)
-{
-  if (cct->_conf->filestore_blackhole) {
-    derr << " filestore_blackhole=true, doing abbreviated shutdown" << dendl;
-    _exit(exitcode);
-  }
-
-  // turn off lockdep; the surviving threads tend to fight with exit() below
-  g_lockdep = 0;
-
-  derr << " pausing thread pools" << dendl;
-  osd_tp.pause();
-  osd_op_tp.pause();
-  disk_tp.pause();
-  recovery_tp.pause();
-  command_tp.pause();
-
-  derr << " sync store" << dendl;
-  store->sync();
-
-  derr << " removing pid file" << dendl;
-  pidfile_remove();
-
-  derr << " exit" << dendl;
-  exit(exitcode);
-}
-
 int OSD::shutdown()
 {
   if (!service.prepare_to_stop())