From 2620cb33c3eb4fc931ccd230bd3086a1f5c99d52 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 7 Feb 2017 10:37:43 -0500 Subject: [PATCH] osd/OSDMap: fix kraken feature requirement Use the FEATUREMASK since this is a reused bit. Signed-off-by: Sage Weil --- src/osd/OSDMap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 4b5cb986314..9dcfee1dd01 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1101,7 +1101,7 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const } mask |= jewel_features; - const uint64_t kraken_features = CEPH_FEATURE_SERVER_KRAKEN + const uint64_t kraken_features = CEPH_FEATUREMASK_SERVER_KRAKEN | CEPH_FEATURE_MSG_ADDR2; if (test_flag(CEPH_OSDMAP_REQUIRE_KRAKEN)) { features |= kraken_features; -- 2.47.3