include/ceph_features: define FEATURE_SERVER_QUINCY

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index e40b6fb953e9e0cd44c1581a1f2c9c2a5c6d48f5..b904e078300d885d3939f38cc6423b94530c1c1a 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -46,7 +46,7 @@ Misc
 Feature bits
 ------------
 
-- [ ] ensure that `SERVER_X` is defined
+- [x] ensure that `SERVER_X` is defined
 - [ ] change any features `DEPRECATED` in release X-3 are now marked `RETIRED`.
 - [ ] look for features that (1) were present in X-2 and (2) have no
   client dependency and mark them `DEPRECATED` as of X.

diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h
index f97440b54f50f303db1bf774498e73aeaab07d8b..802aaf0bbbe6df85592fda6dd212a3e93192aaa3 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -130,7 +130,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(31, 1, MON_SINGLE_PAXOS, NAUTILUS)
 DEFINE_CEPH_FEATURE_RETIRED(32, 1, OSD_SNAPMAPPER, JEWEL, LUMINOUS)
 DEFINE_CEPH_FEATURE(32, 3, STRETCH_MODE)
 DEFINE_CEPH_FEATURE_RETIRED(33, 1, MON_SCRUB, JEWEL, LUMINOUS)
-// available
+DEFINE_CEPH_FEATURE(33, 3, SERVER_QUINCY)
 DEFINE_CEPH_FEATURE_RETIRED(34, 1, OSD_PACKED_RECOVERY, JEWEL, LUMINOUS)
 // available
 DEFINE_CEPH_FEATURE(35, 1, OSD_CACHEPOOL)    // 3.14
@@ -248,6 +248,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATUREMASK_OSD_REPOP_MLCOD | \
         CEPH_FEATUREMASK_SERVER_PACIFIC | \
         CEPH_FEATURE_OSD_FIXED_COLLECTION_LIST | \
+        CEPH_FEATUREMASK_SERVER_QUINCY | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL