features: deprecate CEPH_FEATURE_MON_SCRUB

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

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index a22a49b5acce038777021da734b45b7d8ca7f38e..8cb74635a2a2d15e65d199fc79bdc2b4d932255c 100755 (executable)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -43,7 +43,7 @@
 #define CEPH_FEATURE_OSDHASHPSPOOL  (1ULL<<30)
 #define CEPH_FEATURE_MON_SINGLE_PAXOS (1ULL<<31)
 #define DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER (1ULL<<32) // DEPRECATED: JEWEL
-#define CEPH_FEATURE_MON_SCRUB      (1ULL<<33)
+#define DEPRECATED_CEPH_FEATURE_MON_SCRUB      (1ULL<<33)
 #define CEPH_FEATURE_OSD_PACKED_RECOVERY (1ULL<<34)
 #define CEPH_FEATURE_OSD_CACHEPOOL (1ULL<<35)
 #define CEPH_FEATURE_CRUSH_V2      (1ULL<<36)  /* new indep; SET_* steps */
@@ -147,7 +147,7 @@ static inline unsigned long long ceph_sanitize_features(unsigned long long f) {
          CEPH_FEATURE_NEW_OSDOPREPLY_ENCODING | \
         CEPH_FEATURE_MON_SINGLE_PAXOS |    \
         DEPRECATED_CEPH_FEATURE_OSD_SNAPMAPPER |           \
-        CEPH_FEATURE_MON_SCRUB |           \
+        DEPRECATED_CEPH_FEATURE_MON_SCRUB      |           \
         CEPH_FEATURE_OSD_PACKED_RECOVERY | \
         CEPH_FEATURE_OSD_CACHEPOOL |       \
         CEPH_FEATURE_CRUSH_V2 |            \

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 5911cdbf3256e50be4315e16b48ea12b320b7c19..cd315c9b6237936d780d381127b8e8224ffbb851 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4480,11 +4480,6 @@ int Monitor::scrub_start()
   dout(10) << __func__ << dendl;
   assert(is_leader());
 
-  if ((get_quorum_features() & CEPH_FEATURE_MON_SCRUB) == 0) {
-    clog->warn() << "scrub not supported by entire quorum\n";
-    return -EOPNOTSUPP;
-  }
-
   if (!scrub_result.empty()) {
     clog->info() << "scrub already in progress\n";
     return -EBUSY;