From 2b38dda690c63a3d0b94afb9ed2d7c3747b5ba8b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 22 Mar 2019 17:28:47 -0500 Subject: [PATCH] include/ceph_features: SERVER_O -> SERVER_OCTOPUS Signed-off-by: Sage Weil --- src/include/ceph_features.h | 2 +- src/mon/OSDMonitor.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/ceph_features.h b/src/include/ceph_features.h index 5925b897d65..822982ed008 100644 --- a/src/include/ceph_features.h +++ b/src/include/ceph_features.h @@ -102,7 +102,7 @@ DEFINE_CEPH_FEATURE_RETIRED(14, 1, OMAP, HAMMER, JEWEL) DEFINE_CEPH_FEATURE(14, 2, SERVER_KRAKEN) DEFINE_CEPH_FEATURE(15, 1, MONENC) DEFINE_CEPH_FEATURE_RETIRED(16, 1, QUERY_T, JEWEL, LUMINOUS) -DEFINE_CEPH_FEATURE(16, 3, SERVER_O) +DEFINE_CEPH_FEATURE(16, 3, SERVER_OCTOPUS) DEFINE_CEPH_FEATURE_RETIRED(17, 1, INDEP_PG_MAP, JEWEL, LUMINOUS) DEFINE_CEPH_FEATURE(17, 3, OS_PERF_STAT_NS) DEFINE_CEPH_FEATURE(18, 1, CRUSH_TUNABLES) // 3.6 diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index c115b5c335c..c62932f1e0e 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2823,7 +2823,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) } // make sure upgrades stop at nautilus - if (HAVE_FEATURE(m->osd_features, SERVER_O) && + if (HAVE_FEATURE(m->osd_features, SERVER_OCTOPUS) && osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) { mon->clog->info() << "disallowing boot of post-nautilus OSD " << m->get_orig_source_inst() -- 2.39.5