From 2ead84781d924392d7bd93d9df0bd2697acb88b5 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Fri, 29 Jul 2016 12:21:27 +0800 Subject: [PATCH] mon/OSDMonitor: fix CEPH_FEATURE_SERVER_JEWEL of preprocess_boot() check We shall check CEPH_FEATURE_SERVER_JEWEL carried by osd_features of MOSDBoot message, as it will be properly filled by every OSD during OSD::_send_boot() process. Signed-off-by: xie xingguo --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index f303db3863d7..436fb1846dba 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -1978,7 +1978,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op) } if (osdmap.test_flag(CEPH_OSDMAP_REQUIRE_JEWEL) && - !(m->get_connection()->get_features() & CEPH_FEATURE_SERVER_JEWEL)) { + !(m->osd_features & CEPH_FEATURE_SERVER_JEWEL)) { mon->clog->info() << "disallowing boot of OSD " << m->get_orig_source_inst() << " because the osdmap requires" -- 2.47.3