]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5430c0d) | patch
osd/OSDMap: fix CHOOSE_ARGS feature detection in get_features()
authorSage Weil <sage@redhat.com>
Fri, 14 Jul 2017 17:09:34 +0000 (13:09 -0400)
committerSage Weil <sage@redhat.com>
Fri, 21 Jul 2017 17:50:49 +0000 (13:50 -0400)
commitecf79d566e8e737ab237f9d90bcb502f7592e2f1
tree408615b34c68b173198e285a73684657add203e6tree | snapshot
parent5430c0d944893239c27329459ab503a275f3dabdcommit | diff
osd/OSDMap: fix CHOOSE_ARGS feature detection in get_features()

We need to include the mask in the CEPH_FEATURES_CRUSH value, and | in the
FEATUREMASK later, because this is a second-generation feature bit usage.

This fixes get_min_compat_client(), which was returning 'jewel' when
incompat choose_args were in use instead of 'luminous'.  Now it is correct.

Signed-off-by: Sage Weil <sage@redhat.com>
src/include/ceph_features.h diff | blob | history
src/osd/OSDMap.cc diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.