From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Fri, 29 Jul 2016 04:21:27 +0000 (+0800)
Subject: mon/OSDMonitor: fix CEPH_FEATURE_SERVER_JEWEL of preprocess_boot() check
X-Git-Tag: ses5-milestone5~206^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F10491%2Fhead;p=ceph.git

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 <xie.xingguo@zte.com.cn>
---

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"