Skip to content

Commit

Permalink
radosgw-admin: fix infinite loop in 'datalog list'
Browse files Browse the repository at this point in the history
affects datalog shards with more than 1000 entries

Fixes: https://tracker.ceph.com/issues/44751

Signed-off-by: Casey Bodley <cbodley@redhat.com>
  • Loading branch information
cbodley committed Mar 25, 2020
1 parent d7753e3 commit 166f38f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/rgw/rgw_admin.cc
Expand Up @@ -8551,7 +8551,7 @@ int main(int argc, const char **argv)
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);
}
Expand Down

0 comments on commit 166f38f

Please sign in to comment.