Merge pull request #34172 from cbodley/wip-44751

radosgw-admin: fix infinite loops in 'datalog list'
ceph · May 4, 2020 · a8762af · a8762af
2 parents 67415ea + 166f38f
commit a8762af
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
@@ -8561,7 +8561,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);
       }