From: zhangzhiming <zhangzhm1@chinatelecom.cn>
Date: Wed, 26 Jan 2022 09:00:07 +0000 (+0800)
Subject: rgw: Match decode_json with dump for default-placement in RGWZoneGroup.
X-Git-Tag: v18.0.0~1472^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=45c448c49ed92f629dc07f755f2024715094fd69;p=ceph.git

rgw: Match decode_json with dump for default-placement in RGWZoneGroup.

Fixes: https://tracker.ceph.com/issues/54016
Signed-off-by: zhiming zhang <zhangzhm1@chinatelecom.cn>
---

diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc
index 5daffe58a8ac..c8e8d09b8879 100644
--- a/src/rgw/rgw_zone.cc
+++ b/src/rgw/rgw_zone.cc
@@ -2418,8 +2418,9 @@ void RGWZoneGroup::decode_json(JSONObj *obj)
   JSONDecoder::decode_json("master_zone", master_zone, obj);
   JSONDecoder::decode_json("zones", zones, decode_zones, obj);
   JSONDecoder::decode_json("placement_targets", placement_targets, decode_placement_targets, obj);
-  JSONDecoder::decode_json("default_placement", default_placement.name, obj);
-  JSONDecoder::decode_json("default_storage_class", default_placement.storage_class, obj);
+  string pr;
+  JSONDecoder::decode_json("default_placement", pr, obj);
+  default_placement.from_str(pr);
   JSONDecoder::decode_json("realm_id", realm_id, obj);
   JSONDecoder::decode_json("sync_policy", sync_policy, obj);
 }