RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #552 from ceph/wip-4924-master

Browse Source 
mon: discover mon addrs, names during election state too

Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
João Eduardo Luís 2013-08-28 10:08:31 -07:00
commit f271a73ca5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mon/Monitor.cc
View File

@ -1292,7 +1292,8 @@ void Monitor::handle_probe_reply(MMonProbe *m)
dout(10) << "handle_probe_reply " << m->get_source_inst() << *m << dendl;
dout(10) << " monmap is " << *monmap << dendl;
if (!is_probing()) {
// discover name and addrs during probing or electing states.
if (!is_probing() && !is_electing()) {
m->put();
return;
}
@ -1326,6 +1327,12 @@ void Monitor::handle_probe_reply(MMonProbe *m)
<< peer_name << " -> " << m->name << " in my monmap"
<< dendl;
monmap->rename(peer_name, m->name);
if (is_electing()) {
m->put();
bootstrap();
return;
}
} else {
dout(10) << " peer name is " << peer_name << dendl;
}
@ -1342,6 +1349,12 @@ void Monitor::handle_probe_reply(MMonProbe *m)
}
}
// end discover phase
if (!is_probing()) {
m->put();
return;
}
assert(paxos != NULL);
if (is_synchronizing()) {