From 1a689766a50d346bef9f74d45a5086f54f41cca5 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Apr 2019 09:28:25 -0500 Subject: [PATCH] mon/OSDMonitor: fix osd boot feature vs require_osd_release check Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 7b4beffc243..e5d031c9a37 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2828,12 +2828,12 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) } } - // make sure upgrades stop at nautilus + // make sure osd versions do not span more than 3 releases if (HAVE_FEATURE(m->osd_features, SERVER_OCTOPUS) && - osdmap.require_osd_release < CEPH_RELEASE_NAUTILUS) { - mon->clog->info() << "disallowing boot of post-nautilus OSD " + osdmap.require_osd_release < CEPH_RELEASE_MIMIC) { + mon->clog->info() << "disallowing boot of octopus+ OSD " << m->get_orig_source_inst() - << " because require_osd_release < nautilus"; + << " because require_osd_release < mimic"; goto ignore; } -- 2.39.5