RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 17:42:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

osdmap: move osd_cluster_addr decoding, and make sure that size matches osd_addr

Browse Source
This commit is contained in:
Greg Farnum 2010-07-08 12:06:08 -07:00
parent ed28d5e668
commit 26ff6cb5f2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/osd/OSDMap.h
View File

@ -560,10 +560,6 @@ private:
osd_info[i->first].down_at = epoch;
//cout << "epoch " << epoch << " down osd" << i->first << endl;
}
for (map<int32_t,entity_addr_t>::iterator i = inc.new_up_internal.begin();
i != inc.new_up_internal.end();
++i)
osd_cluster_addr[i->first] = i->second;
for (map<int32_t,entity_addr_t>::iterator i = inc.new_up_client.begin();
i != inc.new_up_client.end();
i++) {
@ -578,7 +574,12 @@ private:
osd_info[i->first].up_from = epoch;
//cout << "epoch " << epoch << " up osd" << i->first << " at " << i->second << "with hb addr" << osd_hb_addr[i->first] << std::endl;
}
for (map<int32_t,entity_addr_t>::iterator i = inc.new_up_internal.begin();
i != inc.new_up_internal.end();
++i)
osd_cluster_addr[i->first] = i->second;
if (osd_cluster_addr.size() != osd_addr.size())
osd_cluster_addr.resize(osd_addr.size());
// info
for (map<int32_t,epoch_t>::iterator i = inc.new_up_thru.begin();
i != inc.new_up_thru.end();