From fe25c861c845d972c5acddd2f3ac3d72f3403f66 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 28 Mar 2020 08:49:28 -0500 Subject: [PATCH] include/ceph_features: define SERVER_PACIFIC Reuse bit 20, which is available. Declare it as gen 3 so that we | in SERVER_MIMIC (bits 57+28). Signed-off-by: Sage Weil --- doc/dev/release-kickoff-checklist.rst | 9 +++++++-- src/include/ceph_features.h | 3 ++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/dev/release-kickoff-checklist.rst b/doc/dev/release-kickoff-checklist.rst index 6083d98bd0b..2dafcb6487f 100644 --- a/doc/dev/release-kickoff-checklist.rst +++ b/doc/dev/release-kickoff-checklist.rst @@ -6,6 +6,9 @@ These steps should be taken when starting a new major release, just after the previous release has been tagged (vX.2.0) and that tag has been merged back into master. +X is the release we are just starting development on. X-1 is the one +that was just released (X-1).2.0. + Versions and tags ----------------- @@ -38,8 +41,10 @@ Misc Feature bits ------------ -- [ ] ensure that SERVER_X is defined -- [ ] +- [x] ensure that SERVER_X is defined +- [x] 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. Compatsets diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 5a21dcf445b..88813e4f440 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -107,7 +107,7 @@ DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES) // 3.6 DEFINE_CEPH_FEATURE_RETIRED(19, 1, CHUNKY_SCRUB, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(19, 2, OSD_PGLOG_HARDLIMIT) DEFINE_CEPH_FEATURE_RETIRED(20, 1, MON_NULLROUTE, JEWEL, LUMINOUS) - +DEFINE_CEPH_FEATURE(20, 3, SERVER_PACIFIC) DEFINE_CEPH_FEATURE_RETIRED(21, 1, MON_GV, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(21, 2, SERVER_LUMINOUS) // 4.13 DEFINE_CEPH_FEATURE(21, 2, RESEND_ON_SPLIT) // overlap @@ -245,6 +245,7 @@ DEFINE_CEPH_FEATURE_DEPRECATED(63, 1, RESERVED_BROKEN, LUMINOUS) // client-facin CEPH_FEATURE_OSD_PGLOG_HARDLIMIT | \ CEPH_FEATUREMASK_SERVER_OCTOPUS | \ CEPH_FEATUREMASK_OSD_REPOP_MLCOD | \ + CEPH_FEATUREMASK_SERVER_PACIFIC | \ 0ULL) #define CEPH_FEATURES_SUPPORTED_DEFAULT CEPH_FEATURES_ALL -- 2.39.5