RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37511 from ivancich/wip-paginate-rgw-bucket-list

Browse Source 
rgw: radosgw-admin should paginate internally when listing bucket

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
This commit is contained in:
J. Eric Ivancich 2020-10-08 12:59:55 -04:00 committed by GitHub
commit de6ae6f6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/rgw/rgw_admin.cc
View File

@ -6002,10 +6002,17 @@ int main(int argc, const char **argv)
return -ret;
}
formatter->open_array_section("entries");
bool truncated;
bool truncated = false;
int count = 0;
if (max_entries < 0)
max_entries = 1000;
static constexpr int MAX_PAGINATE_SIZE = 10000;
static constexpr int DEFAULT_MAX_ENTRIES = 1000;
if (max_entries < 0) {
max_entries = DEFAULT_MAX_ENTRIES;
}
const int paginate_size = std::min(max_entries, MAX_PAGINATE_SIZE);
string prefix;
string delim;
@ -6025,7 +6032,10 @@ int main(int argc, const char **argv)
list_op.params.allow_unordered = bool(allow_unordered);
do {
ret = list_op.list_objects(max_entries - count, &result, &common_prefixes, &truncated, null_yield);
const int remaining = max_entries - count;
ret = list_op.list_objects(std::min(remaining, paginate_size),
&result, &common_prefixes, &truncated,
null_yield);
if (ret < 0) {
cerr << "ERROR: store->list_objects(): " << cpp_strerror(-ret) << std::endl;
return -ret;
@ -6033,8 +6043,7 @@ int main(int argc, const char **argv)
count += result.size();
for (vector<rgw_bucket_dir_entry>::iterator iter = result.begin(); iter != result.end(); ++iter) {
rgw_bucket_dir_entry& entry = *iter;
for (const auto& entry : result) {
encode_json("entry", entry, formatter.get());
}
formatter->flush(cout);