]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSDMap: ignore OSD_ERASURE_CODES for get_min_compat_client
authorSage Weil <sage@redhat.com>
Wed, 25 Oct 2017 22:00:23 +0000 (17:00 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Oct 2017 13:31:07 +0000 (08:31 -0500)
The other feature bits are enough to identify a release, so we can drop
this one.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSDMap.cc

index 60e2620830cc6f9efb18ed7e03cf4ae749d598cd..5e670de0e0cc951ad0ac1c3b3507150c3d846d39 100644 (file)
@@ -1327,8 +1327,6 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const
     }
   }
   mask |= CEPH_FEATURE_OSDHASHPSPOOL | CEPH_FEATURE_OSD_CACHEPOOL;
-  if (entity_type != CEPH_ENTITY_TYPE_CLIENT)
-    mask |= CEPH_FEATURE_OSD_ERASURE_CODES;
 
   if (osd_primary_affinity) {
     for (int i = 0; i < max_osd; ++i) {
@@ -1376,7 +1374,6 @@ uint8_t OSDMap::get_min_compat_client() const
   }
   if (HAVE_FEATURE(f, OSD_PRIMARY_AFFINITY) || // v0.76-553-gf825624
       HAVE_FEATURE(f, CRUSH_TUNABLES3) ||      // v0.76-395-ge20a55d
-      HAVE_FEATURE(f, OSD_ERASURE_CODES) ||    // v0.73-498-gbfc86a8
       HAVE_FEATURE(f, OSD_CACHEPOOL)) {        // v0.67-401-gb91c1c5
     return CEPH_RELEASE_FIREFLY;   // v0.80.0
   }