include/ceph_features: retire MONCLOCKCHECK

Deprecated in Jewel.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 489cb4137a1e67409afaa5453ebb0d7b383e6961..ca746ac5e18be0f14674588539333dca2a146348 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -663,7 +663,6 @@ int main(int argc, const char **argv)
   uint64_t supported =
     CEPH_FEATURE_UID |
     CEPH_FEATURE_NOSRCADDR |
-    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 be5b52da2575eef17ff5c93c5bb6618cc00e2b42..adf80db70af726bb08475e35511d7d62632c66f6 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -70,7 +70,7 @@
 
 DEFINE_CEPH_FEATURE( 0, 1, UID)
 DEFINE_CEPH_FEATURE( 1, 1, NOSRCADDR)
-DEFINE_CEPH_FEATURE_DEPRECATED( 2, 1, MONCLOCKCHECK, JEWEL)
+DEFINE_CEPH_FEATURE_RETIRED( 2, 1, MONCLOCKCHECK, JEWEL, LUMINOUS)
 
 DEFINE_CEPH_FEATURE( 3, 1, FLOCK)
 DEFINE_CEPH_FEATURE( 4, 1, SUBSCRIBE2)
@@ -193,7 +193,6 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
 #define CEPH_FEATURES_ALL               \
        (CEPH_FEATURE_UID |              \
         CEPH_FEATURE_NOSRCADDR |        \
-        DEPRECATED_CEPH_FEATURE_MONCLOCKCHECK |         \
         CEPH_FEATURE_FLOCK |            \
         CEPH_FEATURE_SUBSCRIBE2 |       \
         CEPH_FEATURE_MONNAMES |         \