From 406522d9067b3882df75a6bb830023f1add20c32 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 13 Sep 2019 15:38:50 +0800 Subject: [PATCH] crimson/osd: require_osd_release >= octopus to boot we assume that crimson will GA after octopus+2, so no need to be compatible with pre-octopus releases. Signed-off-by: Kefu Chai --- src/crimson/osd/osd.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index e846c97827615..5b0e2f2df3de6 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -297,8 +297,8 @@ seastar::future<> OSD::_preboot(version_t oldest, version_t newest) logger().warn("osdmap NOUP flag is set, waiting for it to clear"); } else if (!osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE)) { logger().error("osdmap SORTBITWISE OSDMap flag is NOT set; please set it"); - } else if (osdmap->require_osd_release < ceph_release_t::luminous) { - logger().error("osdmap require_osd_release < luminous; please upgrade to luminous"); + } else if (osdmap->require_osd_release < ceph_release_t::octopus) { + logger().error("osdmap require_osd_release < octopus; please upgrade to octopus"); } else if (false) { // TODO: update mon if current fullness state is different from osdmap } else if (version_t n = local_conf()->osd_map_message_max; @@ -669,7 +669,7 @@ seastar::future> OSD::handle_pg_create_info( Ref(), startmap); } - ceph_assert(osdmap->require_osd_release >= ceph_release_t::nautilus); + ceph_assert(osdmap->require_osd_release >= ceph_release_t::octopus); if (!pool->has_flag(pg_pool_t::FLAG_CREATING)) { // this ensures we do not process old creating messages after the // pool's initial pgs have been created (and pg are subsequently @@ -995,11 +995,7 @@ seastar::future<> OSD::handle_peering_op( void OSD::check_osdmap_features() { - if (osdmap->require_osd_release < ceph_release_t::nautilus) { - heartbeat->set_require_authorizer(false); - } else { - heartbeat->set_require_authorizer(true); - } + heartbeat->set_require_authorizer(true); } seastar::future<> OSD::consume_map(epoch_t epoch) -- 2.39.5