Skip to content
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.

Sign up for GitHub

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

Jump to bottom

rgw: add support for the prefix parameter in account listing of Swift API #12047

Merged
merged 3 commits into from
Nov 29, 2016
Merged

rgw: add support for the prefix parameter in account listing of Swift API #12047

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d68e625
rgw: optimize out ctor-copy in RGWListBuckets_ObjStore_SWIFT.
rzarzynski Nov 17, 2016
0e0a14a
rgw: add support for the prefix parameter in account listing of Swift…
rzarzynski Nov 17, 2016
1d7e94b
rgw: switch from g_conf to req_state::cct::_conf in RGWListBuckets_Ob…
rzarzynski Nov 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/rgw/rgw_rest_swift.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_begin(bool has_buckets)
set_req_state_err(s, op_ret);
}

if (!g_conf->rgw_swift_enforce_content_length) {
if (! s->cct->_conf->rgw_swift_enforce_content_length) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

/* Adding account stats in the header to keep align with Swift API */
dump_account_metadata(s,
buckets_count,
Expand Down Expand Up @@ -192,7 +192,7 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_data(RGWUserBuckets& buckets)
s->formatter->dump_int("bytes", obj.size);
}
s->formatter->close_section();
if (! g_conf->rgw_swift_enforce_content_length) {
if (! s->cct->_conf->rgw_swift_enforce_content_length) {
rgw_flush_formatter(s, s->formatter);
}
}
Expand All @@ -204,7 +204,7 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_end()
s->formatter->close_section();
}

if (g_conf->rgw_swift_enforce_content_length) {
if (s->cct->_conf->rgw_swift_enforce_content_length) {
/* Adding account stats in the header to keep align with Swift API */
dump_account_metadata(s,
buckets_count,
Expand All @@ -218,7 +218,7 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_end()
end_header(s, NULL, NULL, s->formatter->get_len(), true);
}

if (sent_data || g_conf->rgw_swift_enforce_content_length) {
if (sent_data || s->cct->_conf->rgw_swift_enforce_content_length) {
rgw_flush_formatter_and_reset(s, s->formatter);
}
}
Expand Down