features: deprecate CEPH_FEATURE_CHUNKY_SCRUB

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 59d2d8da4f054e621cde419994844b2c9c657688..e7bb90c3818a2ed437f986a31107c968952b2863 100644 (file)
--- 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 f67b967e3110f7af7d8f701666a5826cd21a02e8..a078f4a5de342bf00a9fad98aacb360d362f9985 100755 (executable)
--- 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 | \