features: deprecate CEPH_FEATURE_BACKFILL_RESERVATON

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

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index e7bb90c3818a2ed437f986a31107c968952b2863..7aa404e08dca6ff44618e2dd525a780498c04931 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -496,8 +496,7 @@ int main(int argc, const char **argv)
     CEPH_FEATURE_OSDENC |
     CEPH_FEATURE_OSD_SNAPMAPPER |
     CEPH_FEATURE_OSD_PACKED_RECOVERY |
-    CEPH_FEATURE_RECOVERY_RESERVATION |
-    CEPH_FEATURE_BACKFILL_RESERVATION;
+    CEPH_FEATURE_RECOVERY_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 718fe39ee69006412c11f5b6dbc03460854445bc..59bbd4045baae26e16d161313c4f718cd53cb2cc 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -32,7 +32,7 @@
 #define DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB (1ULL<<19) // DEPRECATED: JEWEL
 #define DEPRECATED_CEPH_FEATURE_MON_NULLROUTE  (1ULL<<20) // DEPRECATED: JEWEL
 // UNUSED: (1ULL<<21)
-#define CEPH_FEATURE_BACKFILL_RESERVATION (1ULL<<22)
+#define DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION (1ULL<<22) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_MSG_AUTH      (1ULL<<23)
 #define CEPH_FEATURE_RECOVERY_RESERVATION (1ULL<<24)
 #define CEPH_FEATURE_CRUSH_TUNABLES2 (1ULL<<25)
@@ -135,7 +135,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_CRUSH_TUNABLES |   \
         DEPRECATED_CEPH_FEATURE_CHUNKY_SCRUB | \
         DEPRECATED_CEPH_FEATURE_MON_NULLROUTE |         \
-        CEPH_FEATURE_BACKFILL_RESERVATION | \
+        DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION | \
         CEPH_FEATURE_MSG_AUTH |             \
         CEPH_FEATURE_RECOVERY_RESERVATION | \
         CEPH_FEATURE_CRUSH_TUNABLES2 |      \