RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 00:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: OSDMap: build reverse name->pool map upon decoding

Browse Source 
Commit 3d7c69fb09 introduced a new OSDMap encoding/decoding scheme.
However, while the classic decoding function still kept building the
reverse name->pool map, the new decoding function did not, causing the
monitor to be unable to map pool names to pool ids.

This patch fixes this, by factoring out the loop responsible for
populating the 'name_pool' map, as well as calling 'calc_num_osds()', to
OSDMap::post_decode() and having this function called from both the
classic and the new decode functions.

Fixes: 7166

Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
This commit is contained in:
Joao Eduardo Luis 2014-01-16 12:51:32 +00:00
parent 3b696f28d6
commit 1aa2601818
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/osd/OSDMap.cc
View File

@ -1721,12 +1721,7 @@ void OSDMap::decode_classic(bufferlist::iterator& p)
else
osd_addrs->hb_front_addr.resize(osd_addrs->hb_back_addr.size());
// index pool names
name_pool.clear();
for (map<int64_t,string>::iterator i = pool_name.begin(); i != pool_name.end(); ++i)
name_pool[i->second] = i->first;
calc_num_osds();
post_decode();
}
void OSDMap::decode(bufferlist::iterator& bl)
@ -1793,6 +1788,20 @@ void OSDMap::decode(bufferlist::iterator& bl)
}
DECODE_FINISH(bl); // wrapper
post_decode();
}
void OSDMap::post_decode()
{
// index pool names
name_pool.clear();
for (map<int64_t,string>::iterator i = pool_name.begin();
i != pool_name.end(); ++i) {
name_pool[i->second] = i->first;
}
calc_num_osds();
}
void OSDMap::dump_json(ostream& out) const

1
src/osd/OSDMap.h
View File

@ -475,6 +475,7 @@ private:
void encode_client_old(bufferlist& bl) const;
void encode_classic(bufferlist& bl, uint64_t features) const;
void decode_classic(bufferlist::iterator& p);
void post_decode();
public:
void encode(bufferlist& bl, uint64_t features=CEPH_FEATURES_ALL) const;
void decode(bufferlist& bl);