RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

msgr: fix ip discovery with multiple entities in proc (csyn)

Browse Source
This commit is contained in:
Sage Weil 2008-06-18 06:28:25 -07:00
parent 8d074b5372
commit 3c2ae7ec7e
2 changed files with 14 additions and 3 deletions

15
src/msg/SimpleMessenger.cc
View File

@ -380,9 +380,13 @@ Rank::EntityMessenger *Rank::register_entity(entity_name_t name)
local[erank] = msgr;
stopped[erank] = false;
msgr->_myinst.addr = rank_addr;
if (msgr->_myinst.addr.ipaddr == entity_addr_t().ipaddr)
msgr->need_addr = true;
msgr->_myinst.addr.erank = erank;
dout(10) << "register_entity " << name << " at " << msgr->_myinst.addr << dendl;
dout(10) << "register_entity " << name << " at " << msgr->_myinst.addr
<< " need_addr=" << need_addr
<< dendl;
num_local++;
@ -1398,11 +1402,16 @@ void Rank::Pipe::reader()
entity = rank.local[erank];
// first message?
if (rank.need_addr) {
if (entity->need_addr) {
entity->_set_myaddr(m->get_dest_inst().addr);
dout(2) << "reader entity addr is " << entity->get_myaddr() << dendl;
entity->need_addr = false;
}
if (rank.need_addr) {
rank.rank_addr = m->get_dest_inst().addr;
rank.rank_addr.erank = 0;
dout(2) << "reader my rank addr is " << rank.rank_addr << dendl;
dout(2) << "reader rank_addr is " << rank.rank_addr << dendl;
rank.need_addr = false;
}

2
src/msg/SimpleMessenger.h
View File

@ -224,6 +224,7 @@ private:
bool stop;
int qlen, pqlen;
int my_rank;
bool need_addr;
class DispatchThread : public Thread {
EntityMessenger *m;
@ -288,6 +289,7 @@ private:
stop(false),
qlen(0), pqlen(0),
my_rank(r),
need_addr(false),
dispatch_thread(this) { }
~EntityMessenger() {
// join dispatch thread