osd: fast dispatch M[Mon]Command

These just get dumped onto a work queue.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6453f710699aa8f2969bcf101b0eafc22aaa8dc3..87b5899a91c2a1e4826acf6297b354b74cfd2849 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6536,6 +6536,12 @@ void OSD::ms_fast_dispatch(Message *m)
     dout(10) << "ping from " << m->get_source() << dendl;
     m->put();
     return;
+  case MSG_MON_COMMAND:
+    handle_command(static_cast<MMonCommand*>(m));
+    return;
+  case MSG_COMMAND:
+    handle_command(static_cast<MCommand*>(m));
+    return;
 
   case MSG_OSD_PG_CREATE2:
     return handle_fast_pg_create(static_cast<MOSDPGCreate2*>(m));
@@ -6765,13 +6771,6 @@ void OSD::_dispatch(Message *m)
     break;
 
     // osd
-  case MSG_MON_COMMAND:
-    handle_command(static_cast<MMonCommand*>(m));
-    break;
-  case MSG_COMMAND:
-    handle_command(static_cast<MCommand*>(m));
-    break;
-
   case MSG_OSD_SCRUB:
     handle_scrub(static_cast<MOSDScrub*>(m));
     break;

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index f09bf4f15b4bc9a1c47fd1bc4f70fba4dc143efc..83df4fd503162044b41c54bd8408bee15db413b8 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2120,6 +2120,8 @@ private:
     case CEPH_MSG_PING:
     case CEPH_MSG_OSD_OP:
     case CEPH_MSG_OSD_BACKOFF:
+    case MSG_MON_COMMAND:
+    case MSG_COMMAND:
     case MSG_OSD_PG_CREATE2:
     case MSG_OSD_PG_QUERY:
     case MSG_OSD_PG_INFO: