]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: can't ‘operator<’ ‘ceph_release_t’ and ‘int’ 28053/head
authorchunmei Liu <chunmei.liu@intel.com>
Thu, 9 May 2019 22:22:42 +0000 (15:22 -0700)
committerchunmei Liu <chunmei.liu@intel.com>
Thu, 9 May 2019 22:22:42 +0000 (15:22 -0700)
Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
src/crimson/osd/osd.cc

index 16908a24ae31bba19c5f271b7f447a8dfe1744ec..eb73a3f0960d403793b2f12bcd1f33449a90068a 100644 (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);