diff options
| author | Sage Weil <sage@inktank.com> | 2013-05-21 16:44:00 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-22 16:13:37 -0700 |
| commit | 0262301b3a32620b0c365f5476f234c07e82c48c (patch) | |
| tree | a99b499867203d0f58828370b4bece2ce3f4c8f9 /src/osd/OSD.cc | |
| parent | da1940a21c943abd706b09ad4931c0f1edfec147 (diff) | |
| download | ceph-0262301b3a32620b0c365f5476f234c07e82c48c.tar.gz | |
osd: send hb front addr to monitor at boot
We still aren't binding it to anything yet, or putting it in the OSDMap.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/osd/OSD.cc')
| -rw-r--r-- | src/osd/OSD.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index c672104a730..ab93a800f64 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -3029,18 +3029,20 @@ void OSD::_send_boot() cluster_messenger->set_addr_unknowns(cluster_addr); dout(10) << " assuming cluster_addr ip matches client_addr" << dendl; } - entity_addr_t hb_addr = hbserver_messenger->get_myaddr(); - if (hb_addr.is_blank_ip()) { - int port = hb_addr.get_port(); - hb_addr = cluster_addr; - hb_addr.set_port(port); - hbserver_messenger->set_addr_unknowns(hb_addr); + entity_addr_t hb_back_addr = hb_back_server_messenger->get_myaddr(); + if (hb_back_addr.is_blank_ip()) { + int port = hb_back_addr.get_port(); + hb_back_addr = cluster_addr; + hb_back_addr.set_port(port); + hb_back_server_messenger->set_addr_unknowns(hb_back_addr); dout(10) << " assuming hb_addr ip matches cluster_addr" << dendl; } - MOSDBoot *mboot = new MOSDBoot(superblock, boot_epoch, hb_addr, cluster_addr); + entity_addr_t hb_front_addr; + MOSDBoot *mboot = new MOSDBoot(superblock, boot_epoch, hb_back_addr, hb_front_addr, cluster_addr); dout(10) << " client_addr " << client_messenger->get_myaddr() << ", cluster_addr " << cluster_addr - << ", hb addr " << hb_addr + << ", hb_back_addr " << hb_back_addr + << ", hb_front_addr " << hb_front_addr << dendl; monc->send_mon_message(mboot); } |