From: Samuel Just Date: Wed, 14 Aug 2024 19:40:50 +0000 (-0700) Subject: include/ceph_features: add NVMEOFHA feature bit X-Git-Tag: v20.0.0~1183^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9359a334f9d047e435ec5750e5aa0546f23facd;p=ceph.git include/ceph_features: add NVMEOFHA feature bit Normally, we'd just use the SERVER_SQUID or SERVER_T flags instead of using an extra feature bit. However, the nvmeof ha monitor paxos service has had a more complex development journey. There are users interested in using the nvmeof ha feature in squid, but it didn't make the cutoff for backporting it. There's an upstream nvmeof-squid branch in the ceph.git repository with the patches backported for anyone interested in building it. However, that means that users of our normal stable releases will see the feature added to the monitor one release after anyone who chooses to use the nvmeof-squid branch. We could disallow upgrades from nvmeof-squid to T, but by adding a feature bit here we make such a restriction unnecessary. Signed-off-by: Samuel Just --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 4b444977d180..5547095e8123 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -144,8 +144,7 @@ DEFINE_CEPH_FEATURE(41, 1, CRUSH_TUNABLES3) // 3.15 DEFINE_CEPH_FEATURE(41, 1, OSD_PRIMARY_AFFINITY) // overlap DEFINE_CEPH_FEATURE(42, 1, MSGR_KEEPALIVE2) // 4.3 (for consistency) DEFINE_CEPH_FEATURE(43, 1, OSD_POOLRESEND) // 4.13 -DEFINE_CEPH_FEATURE_RETIRED(44, 1, ERASURE_CODE_PLUGINS_V2, MIMIC, OCTOPUS) -// available +DEFINE_CEPH_FEATURE(44, 2, NVMEOFHA) DEFINE_CEPH_FEATURE_RETIRED(45, 1, OSD_SET_ALLOC_HINT, JEWEL, LUMINOUS) // available DEFINE_CEPH_FEATURE(46, 1, OSD_FADVISE_FLAGS) @@ -224,6 +223,7 @@ DEFINE_CEPH_FEATURE_RETIRED(63, 1, RESERVED_BROKEN, LUMINOUS, QUINCY) // client- CEPH_FEATURE_OSD_PRIMARY_AFFINITY | \ CEPH_FEATURE_MSGR_KEEPALIVE2 | \ CEPH_FEATURE_OSD_POOLRESEND | \ + CEPH_FEATUREMASK_NVMEOFHA | \ CEPH_FEATURE_OSD_FADVISE_FLAGS | \ CEPH_FEATURE_MDS_QUOTA | \ CEPH_FEATURE_CRUSH_V4 | \