Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd/OSDMap: require OSD features only of OSDs #13275

Merged
merged 1 commit into from Feb 6, 2017
Merged

osd/OSDMap: require OSD features only of OSDs #13275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/osd/OSDMap.cc
View file
Open in desktop
Expand Up @@ -1094,18 +1094,20 @@ 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;
if (entity_type == CEPH_ENTITY_TYPE_OSD) {
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;
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;
}
mask |= kraken_features;

if (pmask)
*pmask = mask;
Expand Down