features: deprecate CEPH_FEATURE_PACKED_RECOVERY

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

diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc
index 38ed999cb688919a9708a6685ac70f5d5b9501da..49a82264af45ae61b80f44587c35417477823a95 100644 (file)
--- a/src/ceph_osd.cc
+++ b/src/ceph_osd.cc
@@ -493,8 +493,7 @@ int main(int argc, const char **argv)
   uint64_t osd_required =
     CEPH_FEATURE_UID |
     CEPH_FEATURE_PGID64 |
-    CEPH_FEATURE_OSDENC |
-    CEPH_FEATURE_OSD_PACKED_RECOVERY;
+    CEPH_FEATURE_OSDENC;
 
   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 8cb74635a2a2d15e65d199fc79bdc2b4d932255c..b05e24f52436cc1e51d79549a9ab173a7c8e9f72 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -44,7 +44,7 @@
 #define CEPH_FEATURE_MON_SINGLE_PAXOS (1ULL<<31)
 #define DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER (1ULL<<32) // DEPRECATED: JEWEL
 #define DEPRECATED_CEPH_FEATURE_MON_SCRUB      (1ULL<<33)
-#define CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<34)
+#define DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<34) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_OSD_CACHEPOOL (1ULL<<35)
 #define CEPH_FEATURE_CRUSH_V2      (1ULL<<36)  /* new indep; SET_* steps */
 #define CEPH_FEATURE_EXPORT_PEER   (1ULL<<37)
@@ -148,7 +148,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_MON_SINGLE_PAXOS |    \
         DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER |           \
         DEPRECATED_CEPH_FEATURE_MON_SCRUB      |           \
-        CEPH_FEATURE_OSD_PACKED_RECOVERY | \
+        DEPRECATED_CEPH_FEATURE_OSD_PACKED_RECOVERY | \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \
         CEPH_FEATURE_EXPORT_PEER |         \