From a14022a3debd9e544cbe1035d9ff30ef1af89a9a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 Jun 2018 11:18:59 -0500 Subject: [PATCH] osd: populate metadata with all addrs Signed-off-by: Sage Weil --- src/osd/OSD.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index cd816223bf758..7c2ff7f1d21b9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -5435,10 +5435,10 @@ void OSD::_collect_metadata(map *pm) // not applicable for bluestore (*pm)["osd_journal"] = journal_path; } - (*pm)["front_addr"] = stringify(client_messenger->get_myaddr()); - (*pm)["back_addr"] = stringify(cluster_messenger->get_myaddr()); - (*pm)["hb_front_addr"] = stringify(hb_front_server_messenger->get_myaddr()); - (*pm)["hb_back_addr"] = stringify(hb_back_server_messenger->get_myaddr()); + (*pm)["front_addr"] = stringify(client_messenger->get_myaddrs()); + (*pm)["back_addr"] = stringify(cluster_messenger->get_myaddrs()); + (*pm)["hb_front_addr"] = stringify(hb_front_server_messenger->get_myaddrs()); + (*pm)["hb_back_addr"] = stringify(hb_back_server_messenger->get_myaddrs()); // backend (*pm)["osd_objectstore"] = store->get_type(); @@ -5449,10 +5449,12 @@ void OSD::_collect_metadata(map *pm) collect_sys_info(pm, cct); - (*pm)["front_iface"] = pick_iface(cct, - client_messenger->get_myaddr().get_sockaddr_storage()); - (*pm)["back_iface"] = pick_iface(cct, - cluster_messenger->get_myaddr().get_sockaddr_storage()); + (*pm)["front_iface"] = pick_iface( + cct, + client_messenger->get_myaddrs().front().get_sockaddr_storage()); + (*pm)["back_iface"] = pick_iface( + cct, + cluster_messenger->get_myaddrs().front().get_sockaddr_storage()); set devnames; store->get_devices(&devnames); -- 2.39.5