From dc3ce58add130ca5a0a20b097b0ac934a1b486c7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 26 Mar 2014 17:47:06 -0700 Subject: [PATCH] osd: do not make pg_pool_t incompat when hit_sets are enabled If we enable HitSet tracking, the OSD needs to know this, but clients do not care. Setting the compat version is too heavyweight as it locks out older kernels (*any* currents, currently) who are unaffected by the new fields. Signed-off-by: Sage Weil --- src/osd/osd_types.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index f57ab0cf242bd..c183dca8e3be7 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -1071,8 +1071,6 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const ::encode(read_tier, bl); ::encode(write_tier, bl); ::encode(properties, bl); - if (hit_set_params.get_type() != HitSet::TYPE_NONE) - encode_compat = MAX(encode_compat, 11); // need to be able to understand all the data! ::encode(hit_set_params, bl); ::encode(hit_set_period, bl); ::encode(hit_set_count, bl); @@ -1084,7 +1082,7 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const ::encode(cache_min_flush_age, bl); ::encode(cache_min_evict_age, bl); ::encode(erasure_code_profile, bl); - ENCODE_FINISH_NEW_COMPAT(bl, encode_compat); + ENCODE_FINISH(bl); } void pg_pool_t::decode(bufferlist::iterator& bl) -- 2.39.5