From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Sep 2017 18:55:44 +0000 (-0400)
Subject: mon/OSDMonitor: require-osd-release luminous is now a no-op
X-Git-Tag: v13.0.1~861^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fe771448c6932ac43e1f943b1c0e6324cce596b;p=ceph.git

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 5dd0e3e2bb5f..b61a53426357 100644
--- 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;