Merge pull request #13275 from idryomov/wip-require-osd-features-fix

osd/OSDMap: require OSD features only of OSDs Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Feb 6, 2017 · 088f013 · 088f013
2 parents d67116b + ab558bb
commit 088f013
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -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;