From c92690317776d24b74f370ff30a6d22d51ea5196 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Tue, 13 Oct 2015 14:23:20 +0200 Subject: [PATCH] rgw: print zone name and id in the begining of the dump Signed-off-by: Orit Wasserman --- src/rgw/rgw_json_enc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_json_enc.cc b/src/rgw/rgw_json_enc.cc index 747822b3b643c..6da565f263ddb 100644 --- a/src/rgw/rgw_json_enc.cc +++ b/src/rgw/rgw_json_enc.cc @@ -768,6 +768,7 @@ void RGWPeriod::decode_json(JSONObj *obj) void RGWZoneParams::dump(Formatter *f) const { + RGWSystemMetaObj::dump(f); encode_json("domain_root", domain_root.data_pool, f); encode_json("control_pool", control_pool.data_pool, f); encode_json("gc_pool", gc_pool.data_pool, f); @@ -778,7 +779,6 @@ void RGWZoneParams::dump(Formatter *f) const encode_json("user_email_pool", user_email_pool.data_pool, f); encode_json("user_swift_pool", user_swift_pool.data_pool, f); encode_json("user_uid_pool", user_uid_pool.data_pool, f); - RGWSystemMetaObj::dump(f); encode_json_plain("system_key", system_key, f); encode_json("placement_pools", placement_pools, f); encode_json("metadata_heap", metadata_heap.data_pool, f); @@ -810,6 +810,7 @@ void RGWZonePlacementInfo::decode_json(JSONObj *obj) void RGWZoneParams::decode_json(JSONObj *obj) { + RGWSystemMetaObj::decode_json(obj); ::decode_json("domain_root", domain_root, obj); ::decode_json("control_pool", control_pool, obj); ::decode_json("gc_pool", gc_pool, obj); @@ -820,7 +821,6 @@ void RGWZoneParams::decode_json(JSONObj *obj) ::decode_json("user_email_pool", user_email_pool, obj); ::decode_json("user_swift_pool", user_swift_pool, obj); ::decode_json("user_uid_pool", user_uid_pool, obj); - RGWSystemMetaObj::decode_json(obj); JSONDecoder::decode_json("system_key", system_key, obj); JSONDecoder::decode_json("placement_pools", placement_pools, obj); ::decode_json("metadata_heap", metadata_heap, obj); -- 2.39.5