From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Feb 2017 16:45:00 +0000 (-0500)
Subject: osd: require luminous mons before starting
X-Git-Tag: v12.0.1~467^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e8c50f78e074c29a1bc1be6e6968a9669c6c6c89;p=ceph.git

osd: require luminous mons before starting

Require that mons are upgraded to luminous first.  This will ensure that
the last_force_op_resend flag is set for pre-luminous clients so that
luminous OSDs can safely discard them.  (This will come in a future patch.)

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c79faa3c6c88..a1e92a8447c5 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5001,6 +5001,9 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest)
   } else if (!osdmap->test_flag(CEPH_OSDMAP_REQUIRE_JEWEL)) {
     dout(1) << "osdmap REQUIRE_JEWEL OSDMap flag is NOT set; please set it"
 	    << dendl;
+  } else if (!monc->monmap.get_required_features().contains_all(
+	       ceph::features::mon::FEATURE_LUMINOUS)) {
+    dout(1) << "monmap REQUIRE_LUMINOUS is NOT set; upgrade mons first" << dendl;
   } else if (osdmap->get_epoch() >= oldest - 1 &&
 	     osdmap->get_epoch() + cct->_conf->osd_map_message_max > newest) {
     _send_boot();