RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

crush/CrushWrapper: simplify get_full_location_ordered()

Browse Source 
Just ascend the hierarchy; it is much less complicated.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-10-30 09:00:52 -07:00
parent dcc5e3559f
commit 746069ee62
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/crush/CrushWrapper.cc
View File

@ -323,32 +323,16 @@ map<string, string> CrushWrapper::get_full_location(int id)
int CrushWrapper::get_full_location_ordered(int id, vector<pair<string, string> >& path)
{
int parent_id, ret;
pair<string, string> parent_coord;
parent_coord = get_immediate_parent(id, &ret);
// read the type map and get the name of the type with the largest ID
int high_type = 0;
for (map<int, string>::iterator it = type_map.begin(); it != type_map.end(); ++it){
if ( (*it).first > high_type )
high_type = (*it).first;
}
string high_type_name = type_map[high_type];
path.push_back(parent_coord);
parent_id = get_item_id(parent_coord.second);
while (parent_coord.first != high_type_name) {
parent_coord = get_immediate_parent(parent_id);
int cur = id;
int ret;
while (true) {
pair<string, string> parent_coord = get_immediate_parent(cur, &ret);
if (ret != 0)
break;
path.push_back(parent_coord);
if ( parent_coord.first != high_type_name ){
parent_id = get_item_id(parent_coord.second);
}
cur = get_item_id(parent_coord.second);
}
return ret;
return 0;
}