From: Sage Weil <sage@redhat.com>
Date: Thu, 24 Aug 2017 18:50:11 +0000 (-0400)
Subject: osd: require_osd_release >= luminous
X-Git-Tag: v13.0.1~1107^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ccd07439836059c771120f049033afbf4911513;p=ceph.git

osd: require_osd_release >= luminous

We can drop the luminous mon check now because the
require_osd_release cannot be set to luminous with pre-l mons
anyway.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 6f3127d2e29e..59f0740d8afd 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5074,12 +5074,6 @@ void OSD::tick()
 
   if (is_waiting_for_healthy()) {
     start_boot();
-  } else if (is_preboot() &&
-	     waiting_for_luminous_mons &&
-	     monc->monmap.get_required_features().contains_all(
-	       ceph::features::mon::FEATURE_LUMINOUS)) {
-    // mon upgrade finished!
-    start_boot();
   }
 
   do_waiters();
@@ -5692,7 +5686,6 @@ void OSD::start_boot()
   }
   dout(1) << __func__ << dendl;
   set_state(STATE_PREBOOT);
-  waiting_for_luminous_mons = false;
   dout(10) << "start_boot - have maps " << superblock.oldest_map
 	   << ".." << superblock.newest_map << dendl;
   C_OSD_GetVersion *c = new C_OSD_GetVersion(this);
@@ -5727,14 +5720,9 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
   } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) {
     derr << "osdmap SORTBITWISE OSDMap flag is NOT set; please set it"
 	 << dendl;
-  } else if (osdmap->require_osd_release < CEPH_RELEASE_JEWEL) {
-    derr << "osdmap REQUIRE_JEWEL OSDMap flag is NOT set; please set it"
+  } else if (osdmap->require_osd_release < CEPH_RELEASE_LUMINOUS) {
+    derr << "osdmap require_osd_release < luminous; please upgrade to luminous"
 	 << dendl;
-  } else if (!monc->monmap.get_required_features().contains_all(
-	       ceph::features::mon::FEATURE_LUMINOUS)) {
-    derr << "monmap REQUIRE_LUMINOUS is NOT set; must upgrade all monitors to "
-	 << "Luminous or later before Luminous OSDs will boot" << dendl;
-    waiting_for_luminous_mons = true;
   } else if (service.need_fullness_update()) {
     derr << "osdmap fullness state needs update" << dendl;
     send_full_update();
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 4682479fc719..e85610e79002 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1346,7 +1346,6 @@ public:
 
 private:
   std::atomic_int state{STATE_INITIALIZING};
-  bool waiting_for_luminous_mons = false;
 
 public:
   int get_state() const {