osd/OSDMap: update to umbrella

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index d2e96353a13de6c5a7f9aadc4fc9ea2d425ef32e..6f746eae8f2a282789f7e698a2836b3f5c64204d 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -92,7 +92,7 @@ Mon
 OSDMap
 ------
 
-- [ ] src/osd/OSDMap.cc add release name mapping for `SERVER_X` in `pending_require_osd_release()`
+- [x] src/osd/OSDMap.cc add release name mapping for `SERVER_X` in `pending_require_osd_release()`
 - [ ] OSDMap::get_min_compat_client: core team evaluate
 
 Code cleanup

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 2fd8f80bdc24f71d8e5da40582d69f93246cc1fd..c785630cb3c5d92995c76d210a3b2e3a80df2751 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -8115,6 +8115,10 @@ unsigned OSDMap::get_device_class_flags(int id) const
 
 std::optional<std::string> OSDMap::pending_require_osd_release() const
 {
+  if (HAVE_FEATURE(get_up_osd_features(), SERVER_UMBRELLA) &&
+      require_osd_release < ceph_release_t::umbrella) {
+    return "umbrella";
+  }
   if (HAVE_FEATURE(get_up_osd_features(), SERVER_TENTACLE) &&
       require_osd_release < ceph_release_t::tentacle) {
     return "tentacle";