rgw: enforce max max for reshard logs listings

Previously a list of reshard logs could be unlimited. We need to
enforce time limits on CLS ops.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 1d69ce68a586b7eb94d6bc5fc2f123221ef5512a..fbe5525a40cb9b84547936509f482d25078d68ec 100644 (file)
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -3580,12 +3580,10 @@ static int rgw_bi_list_op(cls_method_context_t hctx,
          op.max, max, op.reshardlog);
 
   int ret;
-  uint32_t count = 0;
-  bool more = false;
   rgw_cls_bi_list_ret op_ret;
 
   if (op.reshardlog) {
-    ret = reshard_log_list_entries(hctx, op.marker, op.max,
+    ret = reshard_log_list_entries(hctx, op.marker, max,
                                   op_ret.entries,
                                   &op_ret.is_truncated);
     if (ret < 0) {
@@ -3597,6 +3595,9 @@ static int rgw_bi_list_op(cls_method_context_t hctx,
     return 0;
   }
 
+  uint32_t count = 0;
+  bool more = false;
+
   ret = list_plain_entries(hctx, op.name_filter, op.marker, max,
                           &op_ret.entries, &more, PlainEntriesRegion::Low);
   if (ret < 0) {