From e0f3960710103ae784cccbd7ce8a35ebe0094385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Tue, 5 Dec 2023 18:38:46 +0100 Subject: [PATCH] osd, doc: make OSDMap::pending_require_osd_release() aware about squid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński --- doc/dev/release-checklists.rst | 2 +- src/osd/OSDMap.cc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst index b2cd47258a51c..dfef011564146 100644 --- 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 index a1f22c591de56..07da2ed6bde6c 100644 --- 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 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";