From: Sage Weil Date: Fri, 11 Aug 2017 16:09:54 +0000 (-0400) Subject: include/ceph_features: SERVER_M -> SERVER_MIMIC X-Git-Tag: v13.0.0~120^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b81212a6df7d721d707a7c00d78b2fce8d6a743;p=ceph.git include/ceph_features: SERVER_M -> SERVER_MIMIC Signed-off-by: Sage Weil --- diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 19fab5f303a5..94bc9311621d 100755 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -111,7 +111,7 @@ DEFINE_CEPH_FEATURE(25, 1, CRUSH_TUNABLES2) DEFINE_CEPH_FEATURE(26, 1, CREATEPOOLID) DEFINE_CEPH_FEATURE(27, 1, REPLY_CREATE_INODE) DEFINE_CEPH_FEATURE_RETIRED(28, 1, OSD_HBMSGS, HAMMER, JEWEL) -DEFINE_CEPH_FEATURE(28, 2, SERVER_M) +DEFINE_CEPH_FEATURE(28, 2, SERVER_MIMIC) DEFINE_CEPH_FEATURE(29, 1, MDSENC) DEFINE_CEPH_FEATURE(30, 1, OSDHASHPSPOOL) DEFINE_CEPH_FEATURE(31, 1, MON_SINGLE_PAXOS) // deprecate me diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 2fef460806fc..0a9d348be2ac 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2195,7 +2195,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) } // make sure upgrades stop at luminous - if (HAVE_FEATURE(m->osd_features, SERVER_M) && + if (HAVE_FEATURE(m->osd_features, SERVER_MIMIC) && osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS) { mon->clog->info() << "disallowing boot of post-luminous OSD " << m->get_orig_source_inst()