features: deprecate CEPH_FEATURE_RECOVERY_RESERVATION

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

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 7aa404e08dca6ff44618e2dd525a780498c04931..29bf5e01419550e90bbc30ec218d3fde49c96936 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -495,8 +495,7 @@ int main(int argc, const char **argv)
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_OSDENC |
     CEPH_FEATURE_OSD_SNAPMAPPER |
-    CEPH_FEATURE_OSD_PACKED_RECOVERY |
-    CEPH_FEATURE_RECOVERY_RESERVATION;
+    CEPH_FEATURE_OSD_PACKED_RECOVERY;
 
   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 59bbd4045baae26e16d161313c4f718cd53cb2cc..29765dc00104c92f3f24ca454a2f60da1ffd8c65 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -34,7 +34,7 @@
 // UNUSED: (1ULL<<21)
 #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 DEPRECATED_CEPH_FEATURE_RECOVERY_RESERVATION (1ULL<<24) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_CRUSH_TUNABLES2 (1ULL<<25)
 #define CEPH_FEATURE_CREATEPOOLID   (1ULL<<26)
 #define CEPH_FEATURE_REPLY_CREATE_INODE   (1ULL<<27)
@@ -137,7 +137,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         DEPRECATED_CEPH_FEATURE_MON_NULLROUTE |         \
         DEPRECATED_CEPH_FEATURE_BACKFILL_RESERVATION | \
         CEPH_FEATURE_MSG_AUTH |             \
-        CEPH_FEATURE_RECOVERY_RESERVATION | \
+        DEPRECATED_CEPH_FEATURE_RECOVERY_RESERVATION | \
         CEPH_FEATURE_CRUSH_TUNABLES2 |      \
         CEPH_FEATURE_CREATEPOOLID |         \
         CEPH_FEATURE_REPLY_CREATE_INODE |   \