features: deprecate CEPH_FEATURE_MONCLOCKCHECK

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

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 96e20c52315db30e59ca82a75375d5e9853a7d20..4bb5c4a5793fcd87d22bed7cd1cae3f158c0e1e9 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -674,7 +674,7 @@ int main(int argc, const char **argv)
   uint64_t supported =
     CEPH_FEATURE_UID |
     CEPH_FEATURE_NOSRCADDR |
-    CEPH_FEATURE_MONCLOCKCHECK |
+    DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |
     CEPH_FEATURE_PGID64 |
     CEPH_FEATURE_MSG_AUTH;
   msgr->set_default_policy(Messenger::Policy::stateless_server(supported, 0));

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index 5d349284c50230cee549c2cbe741655d17dffdc7..5eba490067acef391f310ef0ba98ca764a119aae 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -3,10 +3,16 @@
 
 /*
  * feature bits
+ *
+ * Feature reuse:
+ * Features marked DEPRECATED: <release> are advertized, but not checked in
+ * <release>
+ * Feature bit values marked as UNUSED are not referenced or checked by any
+ * versions we could be talking to and can be reused.
  */
 #define CEPH_FEATURE_UID            (1ULL<<0)
 #define CEPH_FEATURE_NOSRCADDR      (1ULL<<1)
-#define CEPH_FEATURE_MONCLOCKCHECK  (1ULL<<2)
+#define DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK  (1ULL<<2) // DEPRECATED: JEWEL
 #define CEPH_FEATURE_FLOCK          (1ULL<<3)
 #define CEPH_FEATURE_SUBSCRIBE2     (1ULL<<4)
 #define CEPH_FEATURE_MONNAMES       (1ULL<<5)
@@ -111,7 +117,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
 #define CEPH_FEATURES_ALL               \
        (CEPH_FEATURE_UID |              \
         CEPH_FEATURE_NOSRCADDR |        \
-        CEPH_FEATURE_MONCLOCKCHECK |    \
+        DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |         \
         CEPH_FEATURE_FLOCK |            \
         CEPH_FEATURE_SUBSCRIBE2 |       \
         CEPH_FEATURE_MONNAMES |         \

diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h
index b8a9d37545df92c8dab3318d9f3b2b6a0baa1e4c..00af4196d7e54b64232329793ef4e843f9c03056 100644 (file)
--- a/src/messages/MMonPaxos.h
+++ b/src/messages/MMonPaxos.h
@@ -90,10 +90,7 @@ public:
   }
 
   void encode_payload(uint64_t features) {
-    if ((features & CEPH_FEATURE_MONCLOCKCHECK) == 0)
-      header.version = 0;
-    else
-      header.version = HEAD_VERSION;
+    header.version = HEAD_VERSION;
     ::encode(epoch, payload);
     ::encode(op, payload);
     ::encode(first_committed, payload);
@@ -102,8 +99,7 @@ public:
     ::encode(pn, payload);
     ::encode(uncommitted_pn, payload);
     ::encode(lease_timestamp, payload);
-    if (features & CEPH_FEATURE_MONCLOCKCHECK)
-      ::encode(sent_timestamp, payload);
+    ::encode(sent_timestamp, payload);
     ::encode(latest_version, payload);
     ::encode(latest_value, payload);
     ::encode(values, payload);