From b7e5010e5e533ca9cad4585376e20501d8d91e5f Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Fri, 18 Jan 2019 13:35:39 +0800 Subject: [PATCH] osd:remove unused fileds. Session::received_map_epoch only used by OSD::dispatch_op_fast. But this func removed in 3cc48278bf0ee5c9535, So remvoe related code. Signed-off-by: Jianpeng Ma --- src/osd/OSD.cc | 15 --------------- src/osd/OSD.h | 1 - src/osd/Session.h | 4 +--- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 5ba037bba153f..81a121bacc1e3 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -7020,21 +7020,6 @@ void OSD::ms_fast_dispatch(Message *m) OID_EVENT_TRACE_WITH_MSG(m, "MS_FAST_DISPATCH_END", false); } -void OSD::ms_fast_preprocess(Message *m) -{ - if (m->get_connection()->get_peer_type() == CEPH_ENTITY_TYPE_OSD) { - if (m->get_type() == CEPH_MSG_OSD_MAP) { - MOSDMap *mm = static_cast(m); - auto priv = m->get_connection()->get_priv(); - if (auto s = static_cast(priv.get()); s) { - s->received_map_lock.lock(); - s->received_map_epoch = mm->get_last(); - s->received_map_lock.unlock(); - } - } - } -} - bool OSD::ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer) { dout(10) << "OSD::ms_get_authorizer type=" << ceph_entity_type_name(dest_type) << dendl; diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 6b0dface06fd7..14d5f45645970 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -2194,7 +2194,6 @@ private: } } void ms_fast_dispatch(Message *m) override; - void ms_fast_preprocess(Message *m) override; bool ms_dispatch(Message *m) override; bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer) override; void ms_handle_connect(Connection *con) override; diff --git a/src/osd/Session.h b/src/osd/Session.h index be35af61d11a3..e391200d74698 100644 --- a/src/osd/Session.h +++ b/src/osd/Session.h @@ -140,8 +140,6 @@ struct Session : public RefCountedObject { ceph::spinlock sent_epoch_lock; epoch_t last_sent_epoch; - ceph::spinlock received_map_lock; - epoch_t received_map_epoch; // largest epoch seen in MOSDMap from here /// protects backoffs; orders inside Backoff::lock *and* PG::backoff_lock Mutex backoff_lock; @@ -156,7 +154,7 @@ struct Session : public RefCountedObject { socket_addr(con_->get_peer_socket_addr()), wstate(cct), session_dispatch_lock("Session::session_dispatch_lock"), - last_sent_epoch(0), received_map_epoch(0), + last_sent_epoch(0), backoff_lock("Session::backoff_lock") {} -- 2.39.5