From 14895ee13c24f8c6378d0ba5a4fa717cd8555f04 Mon Sep 17 00:00:00 2001 From: Tianshan Qu Date: Thu, 1 Mar 2018 01:32:32 +0800 Subject: [PATCH] rgw: datalog list support --shard-id and --marker Signed-off-by: Tianshan Qu --- src/rgw/rgw_admin.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index d7c43cc0662..53b77f3723a 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -6913,11 +6913,15 @@ next: return -ret; RGWDataChangesLog *log = store->data_log; - RGWDataChangesLog::LogMarker marker; + RGWDataChangesLog::LogMarker log_marker; do { list entries; - ret = log->list_entries(start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, marker, &truncated); + 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); + } else { + ret = log->list_entries(start_time.to_real_time(), end_time.to_real_time(), max_entries - count, entries, log_marker, &truncated); + } if (ret < 0) { cerr << "ERROR: list_bi_log_entries(): " << cpp_strerror(-ret) << std::endl; return -ret; -- 2.39.5