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>
This commit is contained in:
xie xingguo 2016-07-29 12:21:27 +08:00
parent 3b160df0aa
commit 2ead84781d

View File

@ -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"