features: deprecate CEPH_FEATURE_QUERY_T

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 7dd2251bb7ef5f148ae85706af701c3381ec9c06..a71d55177550503f1c210b2d03f794290458b0e8 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -26,7 +26,7 @@
 #define CEPH_FEATURE_OSDENC         (1ULL<<13)
 // UNUSED: (1ULL<<14)
 #define CEPH_FEATURE_MONENC         (1ULL<<15)
-#define CEPH_FEATURE_QUERY_T        (1ULL<<16)
+#define DEPRECATED_CEPH_FEATURE_QUERY_T        (1ULL<<16) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_INDEP_PG_MAP   (1ULL<<17)
 #define CEPH_FEATURE_CRUSH_TUNABLES (1ULL<<18)
 #define CEPH_FEATURE_CHUNKY_SCRUB   (1ULL<<19)
@@ -129,7 +129,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
         CEPH_FEATURE_PGPOOL3 |          \
         CEPH_FEATURE_OSDREPLYMUX |      \
         CEPH_FEATURE_OSDENC |           \
-        CEPH_FEATURE_QUERY_T |          \
+        DEPRECATED_CEPH_FEATURE_QUERY_T |               \
         CEPH_FEATURE_MONENC |           \
         CEPH_FEATURE_INDEP_PG_MAP |     \
         CEPH_FEATURE_CRUSH_TUNABLES |   \

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index f19a7197973ad34a9b2db9cfc36a6146952df804..4d3a8904d58c15221f0aeeeea1e750de6d97b328 100644 (file)
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3186,20 +3186,14 @@ ostream& operator<<(ostream& out, const pg_interval_t& i)
 // -- pg_query_t --
 
 void pg_query_t::encode(bufferlist &bl, uint64_t features) const {
-  if (features & CEPH_FEATURE_QUERY_T) {
-    ENCODE_START(3, 2, bl);
-    ::encode(type, bl);
-    ::encode(since, bl);
-    history.encode(bl);
-    ::encode(epoch_sent, bl);
-    ::encode(to, bl);
-    ::encode(from, bl);
-    ENCODE_FINISH(bl);
-  } else {
-    ::encode(type, bl);
-    ::encode(since, bl);
-    history.encode(bl);
-  }
+  ENCODE_START(3, 2, bl);
+  ::encode(type, bl);
+  ::encode(since, bl);
+  history.encode(bl);
+  ::encode(epoch_sent, bl);
+  ::encode(to, bl);
+  ::encode(from, bl);
+  ENCODE_FINISH(bl);
 }
 
 void pg_query_t::decode(bufferlist::iterator &bl) {