From: Samuel Just Date: Mon, 14 Mar 2016 22:23:01 +0000 (-0700) Subject: features: deprecate CEPH_FEATURE_CHUNKY_SCRUB X-Git-Tag: v10.1.0~17^2~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37518a3e8a4239f9b942c8a08511039b531b8d49;p=ceph.git features: deprecate CEPH_FEATURE_CHUNKY_SCRUB Signed-off-by: Samuel Just --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 59d2d8da4f05..e7bb90c3818a 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -497,8 +497,7 @@ int main(int argc, const char **argv) CEPH_FEATURE_OSD_SNAPMAPPER | CEPH_FEATURE_OSD_PACKED_RECOVERY | CEPH_FEATURE_RECOVERY_RESERVATION | - CEPH_FEATURE_BACKFILL_RESERVATION | - CEPH_FEATURE_CHUNKY_SCRUB; + CEPH_FEATURE_BACKFILL_RESERVATION; ms_public->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); ms_public->set_policy_throttlers(entity_name_t::TYPE_CLIENT, diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index f67b967e3110..a078f4a5de34 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -29,7 +29,7 @@ #define DEPRECATED_CEPH_FEATURE_QUERY_T (1ULL<<16) // DEPRECATED: JEWEL #define DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP (1ULL<<17) // DEPRECATED: JEWEL #define CEPH_FEATURE_CRUSH_TUNABLES (1ULL<<18) -#define CEPH_FEATURE_CHUNKY_SCRUB (1ULL<<19) +#define DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB (1ULL<<19) // DEPRECATED: JEWEL #define CEPH_FEATURE_MON_NULLROUTE (1ULL<<20) #define CEPH_FEATURE_MON_GV (1ULL<<21) #define CEPH_FEATURE_BACKFILL_RESERVATION (1ULL<<22) @@ -133,7 +133,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) { CEPH_FEATURE_MONENC | \ DEPRECATED_CEPH_FEATURE_INDEP_PG_MAP | \ CEPH_FEATURE_CRUSH_TUNABLES | \ - CEPH_FEATURE_CHUNKY_SCRUB | \ + DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \ CEPH_FEATURE_MON_NULLROUTE | \ CEPH_FEATURE_MON_GV | \ CEPH_FEATURE_BACKFILL_RESERVATION | \