From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Aug 2017 13:38:15 +0000 (-0400)
Subject: mon/OSDMonitor: allow require-osd-release mimic
X-Git-Tag: v13.0.1~1107^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56a6c7ea753e28e095859db46b9017d63dc4266a;p=ceph.git

mon/OSDMonitor: allow require-osd-release mimic

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fd6bfdab9a3e..62a6f3a7e565 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -8928,6 +8928,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
 	err = -EPERM;
 	goto reply;
       }
+    } else 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;
+	goto reply;
+      }
     } else {
       ss << "not supported for this release yet";
       err = -EPERM;