From d1115ffbf951a6ce0080da8536fbff469aa5ff28 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 6 Feb 2017 11:58:35 -0500 Subject: [PATCH] mon: fix kraken requirement to use FEATUREMASK, HAVE_FEATURE macro The KRAKEN_SERVER bit was reused. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 117f5cae39e..b951f0675df 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -2188,7 +2188,7 @@ void Monitor::apply_monmap_to_compatset_features() assert(ceph::features::mon::get_persistent().contains_all( ceph::features::mon::FEATURE_KRAKEN)); // this feature should only ever be set if the quorum supports it. - assert(quorum_con_features & CEPH_FEATURE_SERVER_KRAKEN); + assert(HAVE_FEATURE(quorum_con_features, SERVER_KRAKEN)); new_features.incompat.insert(CEPH_MON_FEATURE_INCOMPAT_KRAKEN); } dout(5) << __func__ << dendl; @@ -2211,7 +2211,7 @@ void Monitor::apply_compatset_features_to_quorum_requirements() required_features |= CEPH_FEATURE_ERASURE_CODE_PLUGINS_V3; } if (features.incompat.contains(CEPH_MON_FEATURE_INCOMPAT_KRAKEN)) { - required_features |= CEPH_FEATURE_SERVER_KRAKEN; + required_features |= CEPH_FEATUREMASK_SERVER_KRAKEN; } dout(10) << __func__ << " required_features " << required_features << dendl; } -- 2.39.5