From dfb350e489ea216dc3e4bf192a7c6099dafd0988 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 3 Nov 2016 16:51:16 -0400 Subject: [PATCH] osd: do not boot unless SORTBITWISE and REQUIRE_JEWEL flags are set Signed-off-by: Sage Weil --- src/osd/OSD.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 3e09963c197ac..53f657d9b661a 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4913,9 +4913,12 @@ void OSD::_preboot(epoch_t oldest, epoch_t newest) // if our map within recent history, try to add ourselves to the osdmap. if (osdmap->test_flag(CEPH_OSDMAP_NOUP)) { dout(5) << "osdmap NOUP flag is set, waiting for it to clear" << dendl; - } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE) && - !store->can_sort_nibblewise()) { - dout(1) << "osdmap SORTBITWISE flag is NOT set but our backend does not support nibblewise sort" << dendl; + } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) { + dout(1) << "osdmap SORTBITWISE OSDMap flag is NOT set; please set it" + << dendl; + } 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" -- 2.39.5