From a5b10033df1b8ed8f4424937a9f14220d8782a1d Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 24 Mar 2020 15:01:31 -0400 Subject: [PATCH] radosgw-admin: fix infinite loop in 'datalog list' affects datalog shards with more than 1000 entries Fixes: https://tracker.ceph.com/issues/44751 Signed-off-by: Casey Bodley (cherry picked from commit 166f38fe70e6afd2831bdb87a27c8fe757899b95) Conflicts: src/rgw/rgw_admin.cc - nautilus has "log->list_entries" where master has "datalog_svc->list_entries" --- src/rgw/rgw_admin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 550e649ef752..4ac204ddd242 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -7671,7 +7671,7 @@ next: do { list entries; if (specified_shard_id) { - ret = log->list_entries(shard_id, start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, marker, NULL, &truncated); + ret = log->list_entries(shard_id, start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, marker, &marker, &truncated); } else { ret = log->list_entries(start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, log_marker, &truncated); } -- 2.47.3