From: Alex Ainscow <aainscow@uk.ibm.com>
Date: Fri, 10 Jan 2025 16:02:11 +0000 (+0000)
Subject: osd/OSDMap: update to umbrella
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b087cbfd3644a445c9bfc4d67eda051a9c2a406;p=ceph.git

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 d2e96353a13d..6f746eae8f2a 100644
--- 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 2fd8f80bdc24..c785630cb3c5 100644
--- 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";