From ec9fdd4a9bee1fb6b1abb2455e8b7cea7b8223aa Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Thu, 30 Nov 2023 21:56:17 -0800 Subject: [PATCH] OSDMonitor: update require_osd_release for crush features The existing implementation checks that the currently live OSDs support the pending crush features, but we don't actually check that require_osd_release is new enough. Signed-off-by: Samuel Just --- src/mon/OSDMonitor.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index f8e379326f2..05fabca0d09 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -7562,6 +7562,12 @@ bool OSDMonitor::validate_crush_against_features(const CrushWrapper *newcrush, << newmap.require_min_compat_client; return false; } + if (mv > newmap.require_osd_release) { + ss << "new crush map requires client version " << mv + << " but require_osd_release is " + << newmap.require_osd_release; + return false; + } } // osd compat -- 2.39.5