mon/OSDMonitor: require-osd-release luminous is now a no-op

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 5dd0e3e2bb5f3a88252dc6a5327b602247dd7dbb..b61a53426357ee28c9b0302302a070841ea04f2a 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -8706,13 +8706,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       err = 0;
       goto reply;
     }
-    if (rel == CEPH_RELEASE_LUMINOUS) {
-      if (!HAVE_FEATURE(osdmap.get_up_osd_features(), SERVER_LUMINOUS)) {
-       ss << "not all up OSDs have CEPH_FEATURE_SERVER_LUMINOUS feature";
-       err = -EPERM;
-       goto reply;
-      }
-    } else if (rel == CEPH_RELEASE_MIMIC) {
+    assert(osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS);
+    if (rel == CEPH_RELEASE_MIMIC) {
       if (!HAVE_FEATURE(osdmap.get_up_osd_features(), SERVER_MIMIC)) {
        ss << "not all up OSDs have CEPH_FEATURE_SERVER_MIMIC feature";
        err = -EPERM;