From: Sage Weil <sage@redhat.com>
Date: Thu, 2 Feb 2017 01:32:31 +0000 (-0500)
Subject: mon/OSDMonitor: all upgrades pass through luminous
X-Git-Tag: v12.0.1~467^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c7a9c041cbf2bcc62856203d6472d1a69bc42c50;p=ceph.git

mon/OSDMonitor: all upgrades pass through luminous

Prevent post-luminous OSDs from starting before require_luminous_osds is
set.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2579859cde65..dfd62b96a6be 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1981,6 +1981,15 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op)
     }
   }
 
+  // make sure upgrades stop at luminous
+  if (HAVE_FEATURE(m->osd_features, SERVER_M) &&
+      !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_LUMINOUS)) {
+    mon->clog->info() << "disallowing boot of post-luminous OSD "
+		      << m->get_orig_source_inst()
+		      << " because require_luminous_osds is not set\n";
+    goto ignore;
+  }
+
   // make sure upgrades stop at jewel
   if ((m->osd_features & CEPH_FEATURE_SERVER_KRAKEN) &&
       !osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {