RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30127 from zhangsw/rgw-fix-adminuser

Browse Source 
rgw: add missing admin property when sync user info.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2019-09-19 14:21:37 -04:00 committed by GitHub
commit d5d0d7fef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rgw/rgw_json_enc.cc
View File

@ -484,6 +484,9 @@ void RGWUserInfo::dump(Formatter *f) const
if (system) { /* no need to show it for every user */
encode_json("system", (bool)system, f);
}
if (admin) {
encode_json("admin", (bool)admin, f);
}
encode_json("default_placement", default_placement.name, f);
encode_json("default_storage_class", default_placement.storage_class, f);
encode_json("placement_tags", placement_tags, f);
@ -562,6 +565,9 @@ void RGWUserInfo::decode_json(JSONObj *obj)
bool sys = false;
JSONDecoder::decode_json("system", sys, obj);
system = (__u8)sys;
bool ad = false;
JSONDecoder::decode_json("admin", ad, obj);
admin = (__u8)ad;
JSONDecoder::decode_json("default_placement", default_placement.name, obj);
JSONDecoder::decode_json("default_storage_class", default_placement.storage_class, obj);
JSONDecoder::decode_json("placement_tags", placement_tags, obj);

1
src/rgw/rgw_user.cc
View File

@ -420,6 +420,7 @@ static void dump_user_info(Formatter *f, RGWUserInfo &info,
op_type_to_str(info.op_mask, buf, sizeof(buf));
encode_json("op_mask", (const char *)buf, f);
encode_json("system", (bool)info.system, f);
encode_json("admin", (bool)info.admin, f);
encode_json("default_placement", info.default_placement.name, f);
encode_json("default_storage_class", info.default_placement.storage_class, f);
encode_json("placement_tags", info.placement_tags, f);