include/ceph_features, doc: define FEATURE_SERVER_SQUID

I've departed from 35d483af5425eb08593bc1c3065cfaec99938244
in that way the _incarnation_ is selected to be the very next
one to the retired bit's one.

Signed-off-by: Radosław Zarzyński <rzarzyns@redhat.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 938d6e3e343f27dfc7f57846213983364249a8cd..cafbc71987c824b431dd648aa2f5f0f224fe74f0 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -63,7 +63,7 @@ Docs
 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 794e10efd7a8d1a2b552fd36522e4cc700c9314f..1937eeb4c6987a8bffee5d335975d27dee113991 100644 (file)
--- a/src/include/ceph_features.h
+++ b/src/include/ceph_features.h
@@ -157,7 +157,7 @@ DEFINE_CEPH_FEATURE(47, 1, MDS_QUOTA)        // 4.17
 DEFINE_CEPH_FEATURE(48, 1, CRUSH_V4)         // 4.1
 DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_MIN_SIZE_RECOVERY, JEWEL, LUMINOUS)
 DEFINE_CEPH_FEATURE_RETIRED(49, 1, OSD_PROXY_FEATURES, JEWEL, LUMINOUS) // overlap
-// available
+DEFINE_CEPH_FEATURE(49, 2, SERVER_SQUID);
 DEFINE_CEPH_FEATURE_RETIRED(50, 1, MON_METADATA, MIMIC, OCTOPUS)
 // available
 DEFINE_CEPH_FEATURE_RETIRED(51, 1, OSD_BITWISE_HOBJ_SORT, MIMIC, OCTOPUS)
@@ -252,6 +252,7 @@ DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client-
         CEPH_FEATUREMASK_SERVER_QUINCY | \
         CEPH_FEATURE_RANGE_BLOCKLIST | \
         CEPH_FEATUREMASK_SERVER_REEF | \
+        CEPH_FEATUREMASK_SERVER_SQUID | \
         0ULL)
 
 #define CEPH_FEATURES_SUPPORTED_DEFAULT  CEPH_FEATURES_ALL