From 25e8b22c6f29cd3947b501f6aaf7614ba204a2c8 Mon Sep 17 00:00:00 2001
From: Philipp Hufnagl
Date: Wed, 22 Nov 2023 12:31:41 +0100
Subject: [PATCH] osd: adding 'reef' to pending_require_osd_release
It appears adding 'reef' to pending_require_osd_release has been
forgotten. This PR adds it
Signed-off-by: Philipp Hufangl
(cherry picked from commit e443ef3562f9718b224acb550206497b5fdfe82e)
(cherry picked from commit a6dc3b6e69ee591b08943fd00aef4d3e2fad9964)
---
src/osd/OSDMap.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index c252dd9afdf96..0ef8ad1fe5724 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -7423,6 +7423,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_REEF) &&
+ require_osd_release < ceph_release_t::reef) {
+ return "reef";
+ }
if (HAVE_FEATURE(get_up_osd_features(), SERVER_QUINCY) &&
require_osd_release < ceph_release_t::quincy) {
return "quincy";
--
2.39.5