]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: use CEPH_FEATUREMASK_CRUSH_MSR, not CEPH_FEATURE_CRUSH_MSR
authorSamuel Just <sjust@redhat.com>
Wed, 28 Aug 2024 02:09:40 +0000 (02:09 +0000)
committerLaura Flores <lflores@ibm.com>
Wed, 28 Aug 2024 21:15:14 +0000 (16:15 -0500)
commit148c572f067f5be315c50c25d78cd9482c754fda
treef0e0b198e3adf6434917172bc8909dbfa9de8392
parentc275ad87e7a48bb68fa36991ed23e72898eeff9c
osd: use CEPH_FEATUREMASK_CRUSH_MSR, not CEPH_FEATURE_CRUSH_MSR

This was simply a mistake:

uint64_t features = 0;
features |= CEPH_FEATURE_CRUSH_MSR;
ceph_assert(HAVE_FEATURE(features, CRUSH_MSR));

will fail the assert as CEPH_FEATURE_CRUSH_MSR lacks the mask.  In
basically all cases, CEPH_FEATUREMASK_* is the correct choice.

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit cb157b45c713e76ec95d8b80548998587e02a758)
src/common/ceph_strings.cc
src/include/ceph_features.h
src/osd/OSDMap.cc