From 0c7dd662b6862e89aeb3a224853d1258a01426f6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 20 Jul 2014 08:47:54 -0700 Subject: [PATCH] osd: let Objecter dispatch directly No need for our ObjecterDispatcher wrapper, now! Signed-off-by: Sage Weil --- src/osd/OSD.cc | 29 +---------------------------- src/osd/OSD.h | 12 ------------ 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 7526610b128d5..2d0a563a3eabf 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -213,7 +213,6 @@ OSDService::OSDService(OSD *osd) : objecter(new Objecter(osd->client_messenger->cct, osd->objecter_messenger, osd->monc, &objecter_osdmap, 0, 0)), objecter_finisher(osd->client_messenger->cct), - objecter_dispatcher(this), watch_lock("OSD::watch_lock"), watch_timer(osd->client_messenger->cct, watch_lock), next_notif_id(0), @@ -2000,7 +1999,7 @@ int OSD::init() hb_front_server_messenger->add_dispatcher_head(&heartbeat_dispatcher); hb_back_server_messenger->add_dispatcher_head(&heartbeat_dispatcher); - objecter_messenger->add_dispatcher_head(&service.objecter_dispatcher); + objecter_messenger->add_dispatcher_head(service.objecter); monc->set_want_keys(CEPH_ENTITY_TYPE_MON | CEPH_ENTITY_TYPE_OSD); r = monc->init(); @@ -5353,32 +5352,6 @@ bool OSD::heartbeat_dispatch(Message *m) return true; } -bool OSDService::ObjecterDispatcher::ms_dispatch(Message *m) -{ - if (!osd->objecter->ms_dispatch(m)) - m->put(); - return true; -} - -bool OSDService::ObjecterDispatcher::ms_handle_reset(Connection *con) -{ - osd->objecter->ms_handle_reset(con); - return true; -} - -void OSDService::ObjecterDispatcher::ms_handle_connect(Connection *con) -{ - return osd->objecter->ms_handle_connect(con); -} - -bool OSDService::ObjecterDispatcher::ms_get_authorizer(int dest_type, - AuthAuthorizer **authorizer, - bool force_new) -{ - return osd->objecter->ms_get_authorizer(dest_type, authorizer, force_new); -} - - bool OSD::ms_dispatch(Message *m) { if (m->get_type() == MSG_OSD_MARK_ME_DOWN) { diff --git a/src/osd/OSD.h b/src/osd/OSD.h index c5e40d0d1fce0..f60dd25b6d040 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -652,18 +652,6 @@ public: OSDMap objecter_osdmap; Objecter *objecter; Finisher objecter_finisher; - struct ObjecterDispatcher : public Dispatcher { - OSDService *osd; - bool ms_dispatch(Message *m); - bool ms_handle_reset(Connection *con); - void ms_handle_remote_reset(Connection *con) {} - void ms_handle_connect(Connection *con); - bool ms_get_authorizer(int dest_type, - AuthAuthorizer **authorizer, - bool force_new); - ObjecterDispatcher(OSDService *o) : Dispatcher(cct), osd(o) {} - } objecter_dispatcher; - friend struct ObjecterDispatcher; // -- Watch -- -- 2.39.5