From: Sage Weil Date: Fri, 11 Aug 2017 16:11:47 +0000 (-0400) Subject: include/ceph_features: incarnation 3 can begin! X-Git-Tag: v13.0.0~120^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a1a15478d19caa7db160936b4cb4697a64abeb8;p=ceph.git include/ceph_features: incarnation 3 can begin! With all upgrades passing through luminous, we can now start reusing bits retired in luminous. Our sentinel bitmask will be the combination of SERVER_MIMIC and SERVER_JEWEL (i.e., CEPH_FEATUREMASK_SERVER_MIMIC). Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 94bc9311621d..07980ad5cbf4 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -4,12 +4,13 @@ #include "sys/types.h" /* - * Each time we reclaim bits for reuse we need to specify another bit - * that, if present, indicates we have the new incarnation of that - * feature. Base case is 1 (first use) + * Each time we reclaim bits for reuse we need to specify another + * bitmask that, if all bits are set, indicates we have the new + * incarnation of that feature. Base case is 1 (first use) */ #define CEPH_FEATURE_INCARNATION_1 (0ull) -#define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // CEPH_FEATURE_SERVER_JEWEL +#define CEPH_FEATURE_INCARNATION_2 (1ull<<57) // SERVER_JEWEL +#define CEPH_FEATURE_INCARNATION_3 ((1ull<<57)|(1ull<<28)) // SERVER_MIMIC #define DEFINE_CEPH_FEATURE(bit, incarnation, name) \ const static uint64_t CEPH_FEATURE_##name = (1ULL<