]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: bucket list/stats truncates for user w/ >1000 buckets
authorJ. Eric Ivancich <ivancich@redhat.com>
Thu, 4 Jun 2020 16:41:06 +0000 (12:41 -0400)
committerJ. Eric Ivancich <ivancich@redhat.com>
Fri, 17 Jul 2020 21:58:45 +0000 (17:58 -0400)
The is_truncated flag was not being handled properly and therefore
limited the output on these radosgw-admin commands to 1000 buckets.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 11ab7c8234daa3d4c077710ea4c8b0437e57daf8)

Conflicts:
src/rgw/rgw_bucket.cc -- small organizational adjustments
src/rgw/rgw_sal.h -- does not exist in nautilus

src/rgw/rgw_bucket.cc

index a063b4145ad02acf0f58aef9aa10cf822dcda16e..cc1d911375782ea44dcafa00ff025a1f8c7bfc58 100644 (file)
@@ -1662,6 +1662,7 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state,
     bool is_truncated = false;
 
     do {
+      buckets.clear();
       ret = rgw_read_user_buckets(store, op_state.get_user_id(), buckets,
                                  marker, string(), max_entries, false,
                                  &is_truncated);