From: Sage Weil <sage@newdream.net>
Date: Wed, 21 Dec 2011 22:21:37 +0000 (-0800)
Subject: osd: remove SIGTERM cruft
X-Git-Tag: v0.40~121^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9eee1ecbee0663fd21b93c462950a85c977751b8;p=ceph.git

osd: remove SIGTERM cruft

The default handler will exit(0).  The got_sigterm stuff was dead code.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 80c5321ec1f0..c8683c77b447 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -584,22 +584,6 @@ OSD::~OSD()
   delete store;
 }
 
-bool got_sigterm = false;
-
-void handle_signal(int signal)
-{
-  switch (signal) {
-  case SIGTERM:
-  case SIGINT:
-#ifdef ENABLE_COVERAGE
-    exit(0);
-#else
-    got_sigterm = true;
-#endif
-    break;
-  }
-}
-
 void cls_initialize(ClassHandler *ch);
 
 
@@ -724,9 +708,6 @@ int OSD::init()
   // tick
   timer.add_event_after(g_conf->osd_heartbeat_interval, new C_Tick(this));
 
-#ifdef ENABLE_COVERAGE
-  signal(SIGTERM, handle_signal);
-#endif
 #if 0
   int ret = monc->start_auth_rotating(ename, KEY_ROTATE_TIME);
   if (ret < 0) {
@@ -1698,14 +1679,6 @@ void OSD::heartbeat()
 
   dout(30) << "heartbeat" << dendl;
 
-  if (got_sigterm) {
-    derr << "got SIGTERM, shutting down" << dendl;
-    Message *m = new MGenericMessage(CEPH_MSG_SHUTDOWN);
-    m->set_priority(CEPH_MSG_PRIO_HIGHEST);
-    cluster_messenger->send_message(m, cluster_messenger->get_myinst());
-    return;
-  }
-
   // get CPU load avg
   double loadavgs[1];
   if (getloadavg(loadavgs, 1) == 1)
@@ -1778,13 +1751,6 @@ void OSD::tick()
 
   logger->set(l_osd_buf, buffer::get_total_alloc());
 
-  if (got_sigterm) {
-    derr << "got SIGTERM, shutting down" << dendl;
-    cluster_messenger->send_message(new MGenericMessage(CEPH_MSG_SHUTDOWN),
-			    cluster_messenger->get_myinst());
-    return;
-  }
-
   // periodically kick recovery work queue
   recovery_tp.kick();