]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: drop redundant check for hammer OSDs
authorSage Weil <sage@redhat.com>
Mon, 6 Feb 2017 15:43:19 +0000 (10:43 -0500)
committerSage Weil <sage@redhat.com>
Tue, 7 Feb 2017 15:36:31 +0000 (10:36 -0500)
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>
src/osd/OSD.cc

index 129c59f99934d673d0bb341deeec0abe8db6ac83..c79faa3c6c884d5d59eef8ada69c0ab0f5635b14 100644 (file)
@@ -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();