From c20251b9491f2d377376991f3def75a464afa076 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 19 Jan 2018 08:51:07 -0600 Subject: [PATCH] osd: normal command uses slow dispatch (it can send messages) Signed-off-by: Sage Weil --- src/osd/OSD.cc | 7 ++++--- src/osd/OSD.h | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 255ef21f8f3..1a0179c6194 100644 --- 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(m)); return; - case MSG_COMMAND: - handle_command(static_cast(m)); - return; case MSG_OSD_FORCE_RECOVERY: handle_fast_force_recovery(static_cast(m)); return; @@ -6787,6 +6784,10 @@ void OSD::_dispatch(Message *m) handle_scrub(static_cast(m)); break; + case MSG_COMMAND: + handle_command(static_cast(m)); + return; + // -- need OSDMap -- case MSG_OSD_PG_CREATE: diff --git a/src/osd/OSD.h b/src/osd/OSD.h index cb526076b51..0ca6e16df7f 100644 --- 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: -- 2.39.5