RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 13:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28053 from liu-chunmei/ceph_seastar_bugfix

Browse Source 
crimson/osd: fix the build broken by df771861

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2019-05-10 07:14:47 +08:00 committed by GitHub
commit adb8075138
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -238,7 +238,7 @@ 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_LUMINOUS) {
} else if (osdmap->require_osd_release < ceph_release_t::luminous) {
logger().error("osdmap require_osd_release < luminous; please upgrade to luminous");
} else if (false) {
// TODO: update mon if current fullness state is different from osdmap
@ -825,7 +825,7 @@ seastar::future<> OSD::handle_pg_log(ceph::net::Connection* conn,
void OSD::check_osdmap_features()
{
if (osdmap->require_osd_release < CEPH_RELEASE_NAUTILUS) {
if (osdmap->require_osd_release < ceph_release_t::nautilus) {
heartbeat->set_require_authorizer(false);
} else {
heartbeat->set_require_authorizer(true);