osd, doc: make OSDMap::pending_require_osd_release() aware about squid

Signed-off-by: Radosław Zarzyński <[email protected]>
ljflores · Dec 21, 2023 · e0f3960 · e0f3960
1 parent 196abf5
commit e0f3960
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
@@ -95,7 +95,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()`
 
 Code cleanup
 ------------

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -7410,6 +7410,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_SQUID) &&
+      require_osd_release < ceph_release_t::squid) {
+    return "squid";
+  }
   if (HAVE_FEATURE(get_up_osd_features(), SERVER_REEF) &&
       require_osd_release < ceph_release_t::reef) {
     return "reef";
-Original file line number
+Diff line change
@@ Expand Up / @@ -95,7 +95,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()`
     Code cleanup
     ------------
@@ Expand Down @@