osd: normal command uses slow dispatch (it can send messages)

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 255ef21f8f3b51b6fde1dc73fbde805fb1507ee5..1a0179c6194dc77c55b3f4e0c20fbdb50c1c6916 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6541,9 +6541,6 @@ void OSD::ms_fast_dispatch(Message *m)
   case MSG_MON_COMMAND:
     handle_command(static_cast<MMonCommand*>(m));
     return;
-  case MSG_COMMAND:
-    handle_command(static_cast<MCommand*>(m));
-    return;
   case MSG_OSD_FORCE_RECOVERY:
     handle_fast_force_recovery(static_cast<MOSDForceRecovery*>(m));
     return;
@@ -6787,6 +6784,10 @@ void OSD::_dispatch(Message *m)
     handle_scrub(static_cast<MOSDScrub*>(m));
     break;
 
+  case MSG_COMMAND:
+    handle_command(static_cast<MCommand*>(m));
+    return;
+
     // -- need OSDMap --
 
   case MSG_OSD_PG_CREATE:

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index cb526076b510ea2023841ec27b5dd320a05114c3..0ca6e16df7fc9344e0f6636831fe017bd743428b 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2123,7 +2123,6 @@ private:
     case MSG_OSD_SCRUB2:
     case MSG_OSD_FORCE_RECOVERY:
     case MSG_MON_COMMAND:
-    case MSG_COMMAND:
     case MSG_OSD_PG_CREATE2:
     case MSG_OSD_PG_QUERY:
     case MSG_OSD_PG_INFO: