]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: Match decode_json with dump for default-placement in RGWZoneGroup. 45493/head
authorzhangzhiming <zhangzhm1@chinatelecom.cn>
Wed, 26 Jan 2022 09:00:07 +0000 (17:00 +0800)
committerCory Snyder <csnyder@iland.com>
Thu, 17 Mar 2022 13:31:38 +0000 (09:31 -0400)
Fixes: https://tracker.ceph.com/issues/54016
Signed-off-by: zhiming zhang <zhangzhm1@chinatelecom.cn>
(cherry picked from commit 45c448c49ed92f629dc07f755f2024715094fd69)

src/rgw/rgw_zone.cc

index 5daffe58a8ac99335b2634af56bd4a1586134000..c8e8d09b8879a66adb8548e56b5138fa8627db8c 100644 (file)
@@ -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);
 }