From: Sage Weil <sage@redhat.com>
Date: Mon, 6 Feb 2017 15:43:19 +0000 (-0500)
Subject: osd: drop redundant check for hammer OSDs
X-Git-Tag: v12.0.1~467^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5e3e56e04705c4a3597397eb7d705ebf7ce6458;p=ceph.git

osd: drop redundant check for hammer OSDs

The OSDMAP_REQUIRE_JEWEL flag requirement implies that there are no
pre-0.94.4 (early hammer) OSDs running.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 129c59f9993..c79faa3c6c8 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5001,10 +5001,6 @@ 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 (osdmap->get_num_up_osds() &&
-	     (osdmap->get_up_osd_features() & CEPH_FEATURE_HAMMER_0_94_4) == 0) {
-    dout(1) << "osdmap indicates one or more pre-v0.94.4 hammer OSDs is running"
-	    << dendl;
   } else if (osdmap->get_epoch() >= oldest - 1 &&
 	     osdmap->get_epoch() + cct->_conf->osd_map_message_max > newest) {
     _send_boot();