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

osd/OSDMap: reflect REQUIRE_*_OSDS flag in required features

Browse Source 
Callers should be mindful of the mask output; this isn't necessary
an exhaustive list of features that e.g. a kraken OSD would/should
have--just certain interesting ones.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-01-25 18:40:45 -05:00
parent cd2ab329fc
commit 1a5cc32f0a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/osd/OSDMap.cc
View File

@ -1042,7 +1042,7 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
features |= CEPH_FEATURE_CRUSH_TUNABLES5;
mask |= CEPH_FEATURES_CRUSH;
for (map<int64_t,pg_pool_t>::const_iterator p = pools.begin(); p != pools.end(); ++p) {
for (auto p = pools.begin(); p != pools.end(); ++p) {
if (p->second.has_flag(pg_pool_t::FLAG_HASHPSPOOL)) {
features |= CEPH_FEATURE_OSDHASHPSPOOL;
}
@ -1067,7 +1067,7 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
}
}
if (entity_type == CEPH_ENTITY_TYPE_OSD) {
for (map<string,map<string,string> >::const_iterator p = erasure_code_profiles.begin();
for (auto p = erasure_code_profiles.begin();
p != erasure_code_profiles.end();
++p) {
const map<string,string> &profile = p->second;
@ -1094,6 +1094,19 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
}
mask |= CEPH_FEATURE_OSD_PRIMARY_AFFINITY;
const uint64_t jewel_features = CEPH_FEATURE_SERVER_JEWEL;
if (test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {
features |= jewel_features;
}
mask |= jewel_features;
const uint64_t kraken_features = CEPH_FEATURE_SERVER_KRAKEN
| CEPH_FEATURE_MSG_ADDR2;
if (test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) {
features |= kraken_features;
}
mask |= kraken_features;
if (pmask)
*pmask = mask;
return features;