RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: fix updating account/container metadata of Swift API.

Browse Source 
This patch rectifies an issue with handling of user metadata that are
actually stored by an updated resource (account or container).
The expected behaviour is they will be merged with new medadata coming
from an HTTP client.

Backport: Jewel
Fixes: http://tracker.ceph.com/issues/15779
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
This commit is contained in:
Radoslaw Zarzynski 2016-05-09 17:22:45 +02:00
parent da8e779e1c
commit 3f3b18bff1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rgw/rgw_op.cc
View File

@ -1856,6 +1856,8 @@ static void prepare_add_del_attrs(const map<string, bufferlist>& orig_attrs,
if (aiter != std::end(out_attrs)) {
out_attrs.erase(aiter);
}
} else {
out_attrs[name] = kv.second;
}
} else if (out_attrs.find(name) == std::end(out_attrs)) {
out_attrs[name] = kv.second;
@ -2772,11 +2774,23 @@ void RGWPutMetadataAccount::execute()
return;
}
op_ret = rgw_get_user_attrs_by_uid(store, s->user->user_id, orig_attrs,
&acct_op_tracker);
if (op_ret < 0) {
return;
}
rgw_get_request_metadata(s->cct, s->info, attrs, false);
RGWUserInfo orig_uinfo;
rgw_get_user_info_by_uid(store, s->user->user_id, orig_uinfo, &acct_op_tracker);
prepare_add_del_attrs(orig_attrs, rmattr_names, attrs);
populate_with_generic_attrs(s, attrs);
RGWUserInfo orig_uinfo;
op_ret = rgw_get_user_info_by_uid(store, s->user->user_id, orig_uinfo,
&acct_op_tracker);
if (op_ret < 0) {
return;
}
/* Handle the TempURL-related stuff. */
map<int, string> temp_url_keys;
filter_out_temp_url(attrs, rmattr_names, temp_url_keys);