include/ceph_features: add SERVER_UMBRELLA feature bit

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 83fa71998d549ccf048f4f13ab80e506b74acd1c..8692e2db6f0e4853535cd71bcd67da64f0d05298 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -57,7 +57,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 4b49f5ee621eeac59c11fad05b20ec0829f28315..f6cf35b03f54dc50be2a1fd752ea88898252701c 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -162,9 +162,8 @@ DEFINE_CEPH_FEATURE(49, 2, SERVER_SQUID);
 DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS)
 DEFINE_CEPH_FEATURE(50, 2, SERVER_TENTACLE);
 DEFINE_CEPH_FEATURE(51, 2, NVMEOF_BEACON_DIFF)
-// available
 DEFINE_CEPH_FEATURE_RETIRED(52, 1, OSD_PROXY_WRITE_FEATURES, MIMIC, OCTOPUS)
-// available
+DEFINE_CEPH_FEATURE(52, 2, SERVER_UMBRELLA);
 DEFINE_CEPH_FEATURE_RETIRED(53, 1, ERASURE_CODE_PLUGINS_V3, MIMIC, OCTOPUS)
 // available
 DEFINE_CEPH_FEATURE_RETIRED(54, 1, OSD_HITSET_GMT, MIMIC, OCTOPUS)
@@ -259,6 +258,7 @@ DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client-
         CEPH_FEATUREMASK_SERVER_SQUID | \
         CEPH_FEATUREMASK_SERVER_TENTACLE | \
         CEPH_FEATUREMASK_NVMEOF_BEACON_DIFF | \
+        CEPH_FEATUREMASK_SERVER_UMBRELLA | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL