From 431a13eb370310a383abceeb509fe204a519e087 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 3 Dec 2013 10:59:29 -0800 Subject: [PATCH] osd/OSDMap: fix feature calculation for CACHEPOOL We need to include the faeture in the mask. Signed-off-by: Sage Weil --- src/osd/OSDMap.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index baef187db9e..60ebb8ff38e 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -744,8 +744,8 @@ bool OSDMap::find_osd_on_ip(const entity_addr_t& ip) const uint64_t OSDMap::get_features(uint64_t *pmask) const { - uint64_t features = 0; - uint64_t mask = 0; + uint64_t features = 0; // things we actually have + uint64_t mask = 0; // things we could have if (crush->has_nondefault_tunables()) features |= CEPH_FEATURE_CRUSH_TUNABLES; @@ -762,7 +762,7 @@ uint64_t OSDMap::get_features(uint64_t *pmask) const features |= CEPH_FEATURE_OSD_CACHEPOOL; } } - mask |= CEPH_FEATURE_OSDHASHPSPOOL; + mask |= CEPH_FEATURE_OSDHASHPSPOOL | CEPH_FEATURE_OSD_CACHEPOOL; if (pmask) *pmask = mask; -- 2.47.3