From: David Zafman Date: Tue, 16 Jun 2015 00:55:41 +0000 (-0700) Subject: ceph_osd: Add required feature bits related to this branch to osd_required mask X-Git-Tag: v0.94.6~13^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7206%2Fhead;p=ceph.git ceph_osd: Add required feature bits related to this branch to osd_required mask Signed-off-by: David Zafman (cherry picked from commit 0b2bab460c013ea5cece10ea028d26da3485eaf5) --- diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 884b7edcf44..baef5fd144a 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,