New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rgw: fix response header of Swift API #14280

Merged
merged 1 commit into from Apr 10, 2017

Conversation

Projects
None yet
4 participants
@tone-zhang
Contributor

tone-zhang commented Apr 1, 2017

Response header of Swift API returned by radosgw does not contain
"x-openstack-request-id", but Swift returns it. Enhance the
compatibility of radosgw.

Fixes: http://tracker.ceph.com/issues/19443

Signed-off-by: tone-zhang tone.zhang@linaro.org

@liewegas liewegas changed the title from Change response header of Swift API returned by radosgw to keep align with OpenStack Swift API to rgw: fix response header of Swift API Apr 3, 2017

@tone-zhang

This comment has been minimized.

Contributor

tone-zhang commented Apr 4, 2017

@liewegas Sage, thanks a lot for your update!

@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 4, 2017

hi @tone-zhang, could you please update your commit message with

Fixes: http://tracker.ceph.com/issues/19443
@tone-zhang

This comment has been minimized.

Contributor

tone-zhang commented Apr 5, 2017

@cbodley, thanks a lot for your comment. I have updated the commit message. Could you please have a check? Thanks!

if(s->prot_flags & RGW_REST_SWIFT) {
dump_header(s, "X-Openstack-Request-Id", s->trans_id);
}

This comment has been minimized.

@cbodley

cbodley Apr 5, 2017

Contributor

i would put this part inside dump_trans_id(), where there's already a section for RGW_REST_SWIFT

This comment has been minimized.

@tone-zhang

tone-zhang Apr 6, 2017

Contributor

@cbodley I'd like to move the code inside dump_trans_id().
In the future, if OpenStack Swift extends or refines the "X-Openstack-Request-Id", we need to review the code here.

@cbodley

This comment has been minimized.

Contributor

cbodley commented Apr 5, 2017

@rzarzynski does this look reasonable to you?

rgw: fix response header of Swift API
Response header of Swift API returned by radosgw does not contain
"x-openstack-request-id", but Swift returns it. Enhance the
compatibility of radosgw.

Fixes: http://tracker.ceph.com/issues/19443

Signed-off-by: tone-zhang <tone.zhang@linaro.org>
@tone-zhang

This comment has been minimized.

Contributor

tone-zhang commented Apr 6, 2017

@cbodley @rzarzynski I updated the code and put the modification in dump_trans_id(), could you please have review? Thanks a lot!

@rzarzynski rzarzynski self-assigned this Apr 6, 2017

@rzarzynski

LGTM. The pull request will be merged soon. Thanks for implementing this, @tone-zhang!

@@ -644,6 +644,7 @@ void dump_trans_id(req_state *s)
{
if (s->prot_flags & RGW_REST_SWIFT) {
dump_header(s, "X-Trans-Id", s->trans_id);
dump_header(s, "X-Openstack-Request-Id", s->trans_id);
@rzarzynski

This comment has been minimized.

Contributor

rzarzynski commented Apr 6, 2017

jenkins test this please

@tone-zhang

This comment has been minimized.

Contributor

tone-zhang commented Apr 7, 2017

@cbodley @rzarzynski Thanks a lot for your comments. :)

@rzarzynski

This comment has been minimized.

Contributor

rzarzynski commented Apr 10, 2017

The pull request has been verified in following Teuthology runs:

Finally we have 6 unrelated failures. All of them are because of the well-known Valgrind issue:
strange leak of std::string memory from md_config_t seen in radosgw.

@rzarzynski rzarzynski merged commit c80878a into ceph:master Apr 10, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodifed Submodules submodules for project are unmodified
Details
default Build finished.
Details

@tone-zhang tone-zhang deleted the tone-zhang:bug_19442 branch Apr 21, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment