From f954c7e985107b32ca90ec6fefc37d4b59b0108d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 23 Jan 2021 13:19:02 -0600 Subject: [PATCH] include/ceph_features: define FEATURE_SERVER_QUINCY Signed-off-by: Sage Weil --- doc/dev/release-checklists.rst | 2 +- src/include/ceph_features.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index e40b6fb953e9e..b904e078300d8 100644 --- 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 f97440b54f50f..802aaf0bbbe6d 100644 --- 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 -- 2.39.5