From 39ae70bc4761bcf1f3f25b1a3c79761b8ff1c3cc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 14 Mar 2016 13:01:50 -0400 Subject: [PATCH] unittest_osdmap: default crush tunables now firefly This should have been changed in 000344ef0ca639d515e3f89401bafc9b0b13deda. Signed-off-by: Sage Weil --- src/test/osd/TestOSDMap.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index ea4053f3f789..0b50b32858ce 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -103,21 +103,21 @@ TEST_F(OSDMapTest, Features) { uint64_t features = osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES2); - ASSERT_FALSE(features & CEPH_FEATURE_CRUSH_TUNABLES3); + ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES3); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_V2); ASSERT_TRUE(features & CEPH_FEATURE_OSD_ERASURE_CODES); ASSERT_TRUE(features & CEPH_FEATURE_OSDHASHPSPOOL); - ASSERT_FALSE(features & CEPH_FEATURE_OSD_PRIMARY_AFFINITY); + ASSERT_TRUE(features & CEPH_FEATURE_OSD_PRIMARY_AFFINITY); // clients have a slightly different view features = osdmap.get_features(CEPH_ENTITY_TYPE_CLIENT, NULL); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES2); - ASSERT_FALSE(features & CEPH_FEATURE_CRUSH_TUNABLES3); + ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_TUNABLES3); ASSERT_TRUE(features & CEPH_FEATURE_CRUSH_V2); ASSERT_FALSE(features & CEPH_FEATURE_OSD_ERASURE_CODES); // dont' need this ASSERT_TRUE(features & CEPH_FEATURE_OSDHASHPSPOOL); - ASSERT_FALSE(features & CEPH_FEATURE_OSD_PRIMARY_AFFINITY); + ASSERT_TRUE(features & CEPH_FEATURE_OSD_PRIMARY_AFFINITY); // remove teh EC pool, but leave the rule. add primary affinity. { -- 2.47.3