From: Sage Weil Date: Fri, 25 Jan 2013 17:29:37 +0000 (-0800) Subject: osd: share incoming maps via Connection*, not addrs X-Git-Tag: v0.57~110^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e2fab54a4fdf2f59e2b635cbddef8a5909acb7c;p=ceph.git osd: share incoming maps via Connection*, not addrs Kill a set of parallel methods that are using the old addr/inst-based msgr APIs, and instead use Connection handles. This is much safer and gets us closer to killing the old msgr API. Signed-off-by: Sage Weil --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 0e7de0d98010..e684d26763bb 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3287,47 +3287,45 @@ void OSD::forget_peer_epoch(int peer, epoch_t as_of) } -bool OSD::_share_map_incoming(const entity_inst_t& inst, epoch_t epoch, - Session* session) +bool OSD::_share_map_incoming(entity_name_t name, Connection *con, epoch_t epoch, Session* session) { bool shared = false; - dout(20) << "_share_map_incoming " << inst << " " << epoch << dendl; + dout(20) << "_share_map_incoming " << name << " " << con->get_peer_addr() << " " << epoch << dendl; //assert(osd_lock.is_locked()); assert(is_active()); // does client have old map? - if (inst.name.is_client()) { + if (name.is_client()) { bool sendmap = epoch < osdmap->get_epoch(); if (sendmap && session) { - if ( session->last_sent_epoch < osdmap->get_epoch() ) { + if (session->last_sent_epoch < osdmap->get_epoch()) { session->last_sent_epoch = osdmap->get_epoch(); - } - else { + } else { sendmap = false; //we don't need to send it out again - dout(15) << inst.name << " already sent incremental to update from epoch "<< epoch << dendl; + dout(15) << name << " already sent incremental to update from epoch "<< epoch << dendl; } } if (sendmap) { - dout(10) << inst.name << " has old map " << epoch << " < " << osdmap->get_epoch() << dendl; - send_incremental_map(epoch, inst); + dout(10) << name << " has old map " << epoch << " < " << osdmap->get_epoch() << dendl; + send_incremental_map(epoch, con); shared = true; } } // does peer have old map? - if (inst.name.is_osd() && - osdmap->is_up(inst.name.num()) && - (osdmap->get_cluster_inst(inst.name.num()) == inst || - osdmap->get_hb_inst(inst.name.num()) == inst)) { + if (name.is_osd() && + osdmap->is_up(name.num()) && + (osdmap->get_cluster_addr(name.num()) == con->get_peer_addr() || + osdmap->get_hb_addr(name.num()) == con->get_peer_addr())) { // remember - epoch_t has = note_peer_epoch(inst.name.num(), epoch); + epoch_t has = note_peer_epoch(name.num(), epoch); // share? if (has < osdmap->get_epoch()) { - dout(10) << inst.name << " has old map " << epoch << " < " << osdmap->get_epoch() << dendl; - note_peer_epoch(inst.name.num(), osdmap->get_epoch()); - send_incremental_map(epoch, osdmap->get_cluster_inst(inst.name.num())); + dout(10) << name << " " << con->get_peer_addr() << " has old map " << epoch << " < " << osdmap->get_epoch() << dendl; + note_peer_epoch(name.num(), osdmap->get_epoch()); + send_incremental_map(epoch, con); shared = true; } } @@ -4491,32 +4489,6 @@ void OSD::send_map(MOSDMap *m, Connection *con) msgr->send_message(m, con); } -void OSD::send_incremental_map(epoch_t since, const entity_inst_t& inst, bool lazy) -{ - dout(10) << "send_incremental_map " << since << " -> " << osdmap->get_epoch() - << " to " << inst << dendl; - - if (since < superblock.oldest_map) { - // just send latest full map - MOSDMap *m = new MOSDMap(monc->get_fsid()); - m->oldest_map = superblock.oldest_map; - m->newest_map = superblock.newest_map; - epoch_t e = osdmap->get_epoch(); - get_map_bl(e, m->maps[e]); - send_map(m, inst, lazy); - return; - } - - while (since < osdmap->get_epoch()) { - epoch_t to = osdmap->get_epoch(); - if (to - since > (epoch_t)g_conf->osd_map_message_max) - to = since + g_conf->osd_map_message_max; - MOSDMap *m = build_incremental_map_msg(since, to); - send_map(m, inst, lazy); - since = to; - } -} - void OSD::send_incremental_map(epoch_t since, Connection *con) { dout(10) << "send_incremental_map " << since << " -> " << osdmap->get_epoch() @@ -6031,7 +6003,7 @@ void OSD::handle_op(OpRequestRef op) return; } // share our map with sender, if they're old - _share_map_incoming(m->get_source_inst(), m->get_map_epoch(), + _share_map_incoming(m->get_source(), m->get_connection(), m->get_map_epoch(), (Session *)m->get_connection()->get_priv()); if (op->rmw_flags == 0) { @@ -6158,7 +6130,7 @@ void OSD::handle_sub_op(OpRequestRef op) return; // share our map with sender, if they're old - _share_map_incoming(m->get_source_inst(), m->map_epoch, + _share_map_incoming(m->get_source(), m->get_connection(), m->map_epoch, (Session*)m->get_connection()->get_priv()); if (service.splitting(pgid)) { @@ -6195,7 +6167,7 @@ void OSD::handle_sub_op_reply(OpRequestRef op) if (!require_same_or_newer_map(op, m->get_map_epoch())) return; // share our map with sender, if they're old - _share_map_incoming(m->get_source_inst(), m->get_map_epoch(), + _share_map_incoming(m->get_source(), m->get_connection(), m->get_map_epoch(), (Session*)m->get_connection()->get_priv()); PG *pg = _have_pg(pgid) ? _lookup_pg(pgid) : NULL; diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 23b95e891473..b4c5b8491a34 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -790,7 +790,7 @@ private: epoch_t note_peer_epoch(int p, epoch_t e); void forget_peer_epoch(int p, epoch_t e); - bool _share_map_incoming(const entity_inst_t& inst, epoch_t epoch, + bool _share_map_incoming(entity_name_t name, Connection *con, epoch_t epoch, Session *session = 0); void _share_map_outgoing(int peer, Connection *con, OSDMapRef map = OSDMapRef()); @@ -837,7 +837,6 @@ private: } MOSDMap *build_incremental_map_msg(epoch_t from, epoch_t to); - void send_incremental_map(epoch_t since, const entity_inst_t& inst, bool lazy=false); void send_incremental_map(epoch_t since, Connection *con); void send_map(MOSDMap *m, const entity_inst_t& inst, bool lazy); void send_map(MOSDMap *m, Connection *con);