RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: populate metadata with all addrs

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2018-06-12 11:18:59 -05:00
parent ea1481d08d
commit a14022a3de
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osd/OSD.cc
View File

@ -5435,10 +5435,10 @@ void OSD::_collect_metadata(map<string,string> *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<string,string> *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<string> devnames;
store->get_devices(&devnames);