From 45c448c49ed92f629dc07f755f2024715094fd69 Mon Sep 17 00:00:00 2001 From: zhangzhiming Date: Wed, 26 Jan 2022 17:00:07 +0800 Subject: [PATCH] rgw: Match decode_json with dump for default-placement in RGWZoneGroup. Fixes: https://tracker.ceph.com/issues/54016 Signed-off-by: zhiming zhang --- src/rgw/rgw_zone.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc index 5daffe58a8a..c8e8d09b887 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); } -- 2.39.5