From: Sage Weil <sage@redhat.com>
Date: Wed, 3 Apr 2019 19:12:19 +0000 (-0500)
Subject: mon/OSDMonitor: relax osd check to allow octopus osd with mimic mon
X-Git-Tag: v13.2.6~92^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c408942bf628d2a336df0b077dd4f8e0a1042391;p=ceph.git

mon/OSDMonitor: relax osd check to allow octopus osd with mimic mon

This mirrors commit 1a689766a50d346bef9f74d45a5086f54f41cca5 in master.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e2912ec6c07..9d482adeec6 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2725,12 +2725,12 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op)
     goto ignore;
   }
 
-  // make sure upgrades stop at nautilus
+  // make sure osd versions do not span more than 3 releases
   if (HAVE_FEATURE(m->osd_features, SERVER_O) &&
-      osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) {
+      osdmap.require_osd_release < CEPH_RELEASE_MIMIC) {
     mon->clog->info() << "disallowing boot of post-nautilus OSD "
 		      << m->get_orig_source_inst()
-		      << " because require_osd_release < nautilus";
+		      << " because require_osd_release < mimic";
     goto ignore;
   }