RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 07:19:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30146 from ivancich/wip-fix-min-unordered-bkt-list

Browse Source 
rgw: fix minimum of unordered bucket listing

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
This commit is contained in:
J. Eric Ivancich 2019-09-12 10:47:19 -04:00 committed by GitHub
commit 01263b792a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rgw/rgw_rados.cc
View File

@ -1749,7 +1749,7 @@ int RGWRados::Bucket::List::list_objects_ordered(int64_t max_p,
int count = 0;
bool truncated = true;
const int64_t max = // protect against memory issues and non-positive vals
const int64_t max = // protect against memory issues and negative vals
std::min(bucket_list_objects_absolute_max, std::max(int64_t(0), max_p));
int read_ahead = std::max(cct->_conf->rgw_list_bucket_min_readahead, max);
@ -1942,8 +1942,8 @@ int RGWRados::Bucket::List::list_objects_unordered(int64_t max_p,
int count = 0;
bool truncated = true;
const int64_t max = // protect against memory issues and non-positive vals
std::min(bucket_list_objects_absolute_max, std::max(int64_t(1), max_p));
const int64_t max = // protect against memory issues and negative vals
std::min(bucket_list_objects_absolute_max, std::max(int64_t(0), max_p));
// read a few extra in each call to cls_bucket_list_unordered in
// case some are filtered out due to namespace matching, versioning,