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 <sjust@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f8e379326f25f4439e685e75cc18fb391c08ab30..05fabca0d09a45bb3525fd0cc5da6fc736413143 100644 (file)
--- 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