RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/osd: require_osd_release >= octopus to boot

Browse Source 
we assume that crimson will GA after octopus+2, so no need to be
compatible with pre-octopus releases.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-09-13 15:38:50 +08:00
parent 260ab1a5f2
commit 406522d906
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/crimson/osd/osd.cc
View File

@ -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<Ref<PG>> OSD::handle_pg_create_info(
Ref<PG>(),
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)