From 53742bdbc587747c93413f9db38f3eeb71487872 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 15 Jun 2015 17:55:41 -0700 Subject: [PATCH] ceph_osd: Add required feature bits related to this branch to osd_required mask Signed-off-by: David Zafman (cherry picked from commit 0b2bab460c013ea5cece10ea028d26da3485eaf5) --- src/ceph_osd.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 884b7edcf444..baef5fd144aa 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -412,11 +412,17 @@ int main(int argc, const char **argv) CEPH_FEATURE_MSG_AUTH | CEPH_FEATURE_OSD_ERASURE_CODES; + // All feature bits 0 - 34 should be present from dumpling v0.67 forward uint64_t osd_required = CEPH_FEATURE_UID | CEPH_FEATURE_PGID64 | CEPH_FEATURE_OSDENC | - CEPH_FEATURE_OSD_SNAPMAPPER; + CEPH_FEATURE_OSD_SNAPMAPPER | + CEPH_FEATURE_INDEP_PG_MAP | + CEPH_FEATURE_OSD_PACKED_RECOVERY | + CEPH_FEATURE_RECOVERY_RESERVATION | + CEPH_FEATURE_BACKFILL_RESERVATION | + CEPH_FEATURE_CHUNKY_SCRUB; ms_public->set_default_policy(Messenger::Policy::stateless_server(supported, 0)); ms_public->set_policy_throttlers(entity_name_t::TYPE_CLIENT, -- 2.47.3