From: Sage Weil Date: Tue, 21 May 2013 23:39:00 +0000 (-0700) Subject: osd/OSDMap: hb_addr -> hb_back_addr X-Git-Tag: v0.64~61^2~7 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=342eed36fbc5010e443e93ca2df5f9c361f2cf31;p=ceph.git osd/OSDMap: hb_addr -> hb_back_addr Signed-off-by: Sage Weil --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index fbc0555ed143..31e7d51fac2c 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3117,7 +3117,7 @@ ConnectionRef OSDService::get_con_osd_hb(int peer, epoch_t from_epoch) return NULL; } ConnectionRef ret( - osd->hbclient_messenger->get_connection(next_osdmap->get_hb_inst(peer))); + osd->hbclient_messenger->get_connection(next_osdmap->get_hb_back_inst(peer))); ret->put(); // Ref from get_connection return ret; } @@ -4415,7 +4415,7 @@ void OSD::handle_osd_map(MOSDMap *m) } else if (!osdmap->is_up(whoami) || !osdmap->get_addr(whoami).probably_equals(client_messenger->get_myaddr()) || !osdmap->get_cluster_addr(whoami).probably_equals(cluster_messenger->get_myaddr()) || - !osdmap->get_hb_addr(whoami).probably_equals(hbserver_messenger->get_myaddr())) { + !osdmap->get_hb_back_addr(whoami).probably_equals(hbserver_messenger->get_myaddr())) { if (!osdmap->is_up(whoami)) { if (service.is_preparing_to_stop()) { service.got_stop_ack(); @@ -4432,9 +4432,9 @@ void OSD::handle_osd_map(MOSDMap *m) clog.error() << "map e" << osdmap->get_epoch() << " had wrong cluster addr (" << osdmap->get_cluster_addr(whoami) << " != my " << cluster_messenger->get_myaddr() << ")"; - else if (!osdmap->get_hb_addr(whoami).probably_equals(hbserver_messenger->get_myaddr())) + else if (!osdmap->get_hb_back_addr(whoami).probably_equals(hbserver_messenger->get_myaddr())) clog.error() << "map e" << osdmap->get_epoch() - << " had wrong hb addr (" << osdmap->get_hb_addr(whoami) + << " had wrong hb back addr (" << osdmap->get_hb_back_addr(whoami) << " != my " << hbserver_messenger->get_myaddr() << ")"; if (!service.is_stopping()) { diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index a3b5fed259ad..71e680308c7c 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -623,7 +623,7 @@ void OSDMap::set_max_osd(int m) osd_xinfo.resize(m); osd_addrs->client_addr.resize(m); osd_addrs->cluster_addr.resize(m); - osd_addrs->hb_addr.resize(m); + osd_addrs->hb_back_addr.resize(m); osd_uuid->resize(m); calc_num_osds(); @@ -758,9 +758,9 @@ void OSDMap::dedup(const OSDMap *o, OSDMap *n) n->osd_addrs->cluster_addr[i] = o->osd_addrs->cluster_addr[i]; else diff++; - if ( n->osd_addrs->hb_addr[i] && o->osd_addrs->hb_addr[i] && - *n->osd_addrs->hb_addr[i] == *o->osd_addrs->hb_addr[i]) - n->osd_addrs->hb_addr[i] = o->osd_addrs->hb_addr[i]; + if ( n->osd_addrs->hb_back_addr[i] && o->osd_addrs->hb_back_addr[i] && + *n->osd_addrs->hb_back_addr[i] == *o->osd_addrs->hb_back_addr[i]) + n->osd_addrs->hb_back_addr[i] = o->osd_addrs->hb_back_addr[i]; else diff++; } @@ -870,9 +870,9 @@ int OSDMap::apply_incremental(const Incremental &inc) osd_state[i->first] |= CEPH_OSD_EXISTS | CEPH_OSD_UP; osd_addrs->client_addr[i->first].reset(new entity_addr_t(i->second)); if (inc.new_hb_back_up.empty()) - osd_addrs->hb_addr[i->first].reset(new entity_addr_t(i->second)); //this is a backward-compatibility hack + osd_addrs->hb_back_addr[i->first].reset(new entity_addr_t(i->second)); //this is a backward-compatibility hack else - osd_addrs->hb_addr[i->first].reset( + osd_addrs->hb_back_addr[i->first].reset( new entity_addr_t(inc.new_hb_back_up.find(i->first)->second)); osd_info[i->first].up_from = epoch; } @@ -1186,7 +1186,7 @@ void OSDMap::encode(bufferlist& bl, uint64_t features) const // extended __u16 ev = 9; ::encode(ev, bl); - ::encode(osd_addrs->hb_addr, bl); + ::encode(osd_addrs->hb_back_addr, bl); ::encode(osd_info, bl); ::encode(blacklist, bl); ::encode(osd_addrs->cluster_addr, bl); @@ -1277,7 +1277,7 @@ void OSDMap::decode(bufferlist::iterator& p) __u16 ev = 0; if (v >= 5) ::decode(ev, p); - ::decode(osd_addrs->hb_addr, p); + ::decode(osd_addrs->hb_back_addr, p); ::decode(osd_info, p); if (v < 5) ::decode(pool_name, p); @@ -1358,7 +1358,7 @@ void OSDMap::dump(Formatter *f) const get_info(i).dump(f); f->dump_stream("public_addr") << get_addr(i); f->dump_stream("cluster_addr") << get_cluster_addr(i); - f->dump_stream("heartbeat_addr") << get_hb_addr(i); + f->dump_stream("heartbeat_addr") << get_hb_back_addr(i); set st; get_state(i, st); @@ -1504,7 +1504,7 @@ void OSDMap::print(ostream& out) const out << " weight " << get_weightf(i); const osd_info_t& info(get_info(i)); out << " " << info; - out << " " << get_addr(i) << " " << get_cluster_addr(i) << " " << get_hb_addr(i); + out << " " << get_addr(i) << " " << get_cluster_addr(i) << " " << get_hb_back_addr(i); set st; get_state(i, st); out << " " << st; diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 8038dfd32eab..52877f251623 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -181,7 +181,7 @@ private: struct addrs_s { vector > client_addr; vector > cluster_addr; - vector > hb_addr; + vector > hb_back_addr; entity_addr_t blank; }; std::tr1::shared_ptr osd_addrs; @@ -343,9 +343,9 @@ private: return get_addr(osd); return *osd_addrs->cluster_addr[osd]; } - const entity_addr_t &get_hb_addr(int osd) const { + const entity_addr_t &get_hb_back_addr(int osd) const { assert(exists(osd)); - return osd_addrs->hb_addr[osd] ? *osd_addrs->hb_addr[osd] : osd_addrs->blank; + return osd_addrs->hb_back_addr[osd] ? *osd_addrs->hb_back_addr[osd] : osd_addrs->blank; } entity_inst_t get_inst(int osd) const { assert(is_up(osd)); @@ -355,9 +355,9 @@ private: assert(is_up(osd)); return entity_inst_t(entity_name_t::OSD(osd), get_cluster_addr(osd)); } - entity_inst_t get_hb_inst(int osd) const { + entity_inst_t get_hb_back_inst(int osd) const { assert(is_up(osd)); - return entity_inst_t(entity_name_t::OSD(osd), get_hb_addr(osd)); + return entity_inst_t(entity_name_t::OSD(osd), get_hb_back_addr(osd)); } const uuid_d& get_uuid(int osd) const {