rgw: add support for the prefix parameter in account listing of Swift API #12047
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
… API. Fixes: http://tracker.ceph.com/issues/17931 Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
|
No regression in Tempest. S3 isn't affected by the PR. |
…jStore_SWIFT. Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
|
@yehudasa: refactored the dependency on Tempest is still fine with this PR. |
|
@rzarzynski I still see use of g_conf there |
|
@yehudasa: have you meant the occurrences of |
|
@rzarzynski no, it's ok now, not sure what happened before. |
yehudasa
reviewed
Nov 18, 2016
| s->formatter->open_object_section("container"); | ||
| s->formatter->dump_string("name", obj.bucket.name); | ||
| if (need_stats) { | ||
| s->formatter->dump_int("count", obj.count); | ||
| s->formatter->dump_int("bytes", obj.size); | ||
| } | ||
| s->formatter->close_section(); | ||
| if (!g_conf->rgw_swift_enforce_content_length) { | ||
| if (! g_conf->rgw_swift_enforce_content_length) { |
There was a problem hiding this comment.
@rzarzynski actually, see this one ^^^
| @@ -177,7 +177,7 @@ void RGWListBuckets_ObjStore_SWIFT::send_response_data(RGWUserBuckets& buckets) | |||
| return; | |||
|
|
|||
| for (iter = m.begin(); iter != m.end(); ++iter) { | |||
| RGWBucketEnt obj = iter->second; | |||
| const RGWBucketEnt& obj = iter->second; | |||
| * in applying the filter earlier as we really need to go through all | ||
| * entries regardless of it (the headers like X-Account-Container-Count | ||
| * aren't affected by specifying prefix). */ | ||
| const std::map<std::string, RGWBucketEnt>& m = buckets.get_buckets(); |
| @@ -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) { | |||
mattbenjamin
approved these changes
Nov 29, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: http://tracker.ceph.com/issues/17931