diff options
| author | Casey Bodley <cbodley@redhat.com> | 2022-02-09 21:08:02 +0100 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2022-05-27 21:47:33 +0200 |
| commit | 24431e07b22688669ea8451028a8d3cc1b98047d (patch) | |
| tree | 03a06fef4df5b5e699252476aca4e9586f2ec3d8 /src/rgw/rgw_zone.cc | |
| parent | rgw: RGWBucket::sync() no longer duplicates datalog/bilog entries (diff) | |
| download | ceph-24431e07b22688669ea8451028a8d3cc1b98047d.tar.xz ceph-24431e07b22688669ea8451028a8d3cc1b98047d.zip | |
rgw: add back json for zone/zonegroup features
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'src/rgw/rgw_zone.cc')
| -rw-r--r-- | src/rgw/rgw_zone.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rgw/rgw_zone.cc b/src/rgw/rgw_zone.cc index 17d3fe99025..517c6ec39ad 100644 --- a/src/rgw/rgw_zone.cc +++ b/src/rgw/rgw_zone.cc @@ -2404,6 +2404,7 @@ void RGWZoneGroup::dump(Formatter *f) const encode_json("default_placement", default_placement, f); encode_json("realm_id", realm_id, f); encode_json("sync_policy", sync_policy, f); + encode_json("enabled_features", enabled_features, f); } static void decode_zones(map<rgw_zone_id, RGWZone>& zones, JSONObj *o) @@ -2448,6 +2449,7 @@ void RGWZoneGroup::decode_json(JSONObj *obj) default_placement.from_str(pr); JSONDecoder::decode_json("realm_id", realm_id, obj); JSONDecoder::decode_json("sync_policy", sync_policy, obj); + JSONDecoder::decode_json("enabled_features", enabled_features, obj); } void rgw_meta_sync_info::generate_test_instances(list<rgw_meta_sync_info*>& o) @@ -2700,6 +2702,7 @@ void RGWZone::dump(Formatter *f) const encode_json("sync_from_all", sync_from_all, f); encode_json("sync_from", sync_from, f); encode_json("redirect_zone", redirect_zone, f); + encode_json("supported_features", supported_features, f); } void RGWZone::decode_json(JSONObj *obj) @@ -2718,6 +2721,7 @@ void RGWZone::decode_json(JSONObj *obj) JSONDecoder::decode_json("sync_from_all", sync_from_all, true, obj); JSONDecoder::decode_json("sync_from", sync_from, obj); JSONDecoder::decode_json("redirect_zone", redirect_zone, obj); + JSONDecoder::decode_json("supported_features", supported_features, obj); } void RGWTierACLMapping::dump(Formatter *f) const |