]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: fix infinite loop in 'datalog list' 34172/head
authorCasey Bodley <cbodley@redhat.com>
Tue, 24 Mar 2020 19:01:31 +0000 (15:01 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 25 Mar 2020 13:38:09 +0000 (09:38 -0400)
affects datalog shards with more than 1000 entries

Fixes: https://tracker.ceph.com/issues/44751
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_admin.cc

index 99285b4444346307a162e750eb406159ae1883ec..736e386b8b7d0303831edac08e0413a811dd3f6d 100644 (file)
@@ -8551,7 +8551,7 @@ next:
     do {
       list<rgw_data_change_log_entry> entries;
       if (specified_shard_id) {
-        ret = datalog_svc->list_entries(shard_id, start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, marker, NULL, &truncated);
+        ret = datalog_svc->list_entries(shard_id, start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, marker, &marker, &truncated);
       } else {
         ret = datalog_svc->list_entries(start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, log_marker, &truncated);
       }