From d8ad08559c573af6b9f6e55416473c38a936c795 Mon Sep 17 00:00:00 2001 From: weiqiaomiao Date: Sat, 23 Jul 2016 15:49:48 +0800 Subject: [PATCH] rgw:fix rgw boot failed after upgrade to master latest version Signed-off-by: weiqiaomiao --- src/rgw/rgw_rados.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h index 4af138f04836e..27082b8830d32 100644 --- a/src/rgw/rgw_rados.h +++ b/src/rgw/rgw_rados.h @@ -895,11 +895,10 @@ struct RGWZoneParams : RGWSystemMetaObj { int fix_pool_names(); void encode(bufferlist& bl) const { - ENCODE_START(6, 1, bl); + ENCODE_START(7, 1, bl); ::encode(domain_root, bl); ::encode(control_pool, bl); ::encode(gc_pool, bl); - ::encode(lc_pool, bl); ::encode(log_pool, bl); ::encode(intent_log_pool, bl); ::encode(usage_log_pool, bl); @@ -912,15 +911,15 @@ struct RGWZoneParams : RGWSystemMetaObj { ::encode(placement_pools, bl); ::encode(metadata_heap, bl); ::encode(realm_id, bl); + ::encode(lc_pool, bl); ENCODE_FINISH(bl); } void decode(bufferlist::iterator& bl) { - DECODE_START(6, bl); + DECODE_START(7, bl); ::decode(domain_root, bl); ::decode(control_pool, bl); ::decode(gc_pool, bl); - ::decode(lc_pool, bl); ::decode(log_pool, bl); ::decode(intent_log_pool, bl); ::decode(usage_log_pool, bl); @@ -943,6 +942,11 @@ struct RGWZoneParams : RGWSystemMetaObj { if (struct_v >= 6) { ::decode(realm_id, bl); } + if (struct_v >= 7) { + ::decode(lc_pool, bl); + } else { + lc_pool = name + ".rgw.lc"; + } DECODE_FINISH(bl); } void dump(Formatter *f) const; -- 2.39.5