doc, include/ceph_features: define FEATURE_SERVER_REEF

I'm mimicking the f954c7e985107b32ca90ec6fefc37d4b59b0108d
but shouldn't the incarnation bit set to `2` instead `3`?

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 003299fe725016810912f335dbb33165dcee517a..952707425543ae31236a14823265e1fd9664741a 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 1287d39431c9e372a339da94920118a96b479e55..6252493744610c81ca3724e5f912c2f8a12c391f 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -127,7 +127,7 @@ DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC)
 DEFINE_CEPH_FEATURE(29, 1, MDSENC)           // 4.7
 DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL)    // 3.9
 DEFINE_CEPH_FEATURE_RETIRED(31, 1, MON_SINGLE_PAXOS, NAUTILUS, PACIFIC)
-// available for R
+DEFINE_CEPH_FEATURE(31, 3, SERVER_REEF)
 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)
@@ -250,6 +250,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin
         CEPH_FEATURE_OSD_FIXED_COLLECTION_LIST | \
         CEPH_FEATUREMASK_SERVER_QUINCY | \
         CEPH_FEATURE_RANGE_BLOCKLIST | \
+        CEPH_FEATUREMASK_SERVER_REEF | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL