From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Feb 2012 17:43:03 +0000 (-0800)
Subject: osd: drop "stop" command
X-Git-Tag: v0.43~38^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49588e9462d1971238095eab5e86e020a2b09730;p=ceph.git

osd: drop "stop" command

Send SIGINT.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index ff39468c42c..696ead32327 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2290,13 +2290,6 @@ void OSD::handle_command(MMonCommand *m)
   if (!require_mon_peer(m))
     return;
 
-  // special case shutdown, since shutdown() stops the command_tp
-  if (m->cmd[0] == "stop") {
-    shutdown();
-    m->put();
-    return;
-  }
-
   Command *c = new Command(m->cmd, m->get_tid(), m->get_data(), NULL);
   command_wq.queue(c);
   m->put();
@@ -2321,13 +2314,6 @@ void OSD::handle_command(MCommand *m)
     return;
   }
 
-  // special case shutdown, since shutdown() stops the command_tp
-  if (m->cmd[0] == "stop") {
-    shutdown();
-    m->put();
-    return;
-  }
-
   Command *c = new Command(m->cmd, m->get_tid(), m->get_data(), con);
   command_wq.queue(c);