From f7ea4ea2b2264fc74beb04872246a853efb9206a Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 14 Aug 2017 15:25:44 -0400 Subject: [PATCH] cls/log: cls_log_list always returns next marker commit 5334622a8365520fa4247241f97422c044cbf5b2 changed cls_log_list() to only return the next marker if the results were truncated this broke RGWMetaSyncShardCR in rgw_sync.cc, which relies on cls_log_list() to track its max_marker Fixes: http://tracker.ceph.com/issues/20906 Signed-off-by: Casey Bodley --- src/cls/log/cls_log.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cls/log/cls_log.cc b/src/cls/log/cls_log.cc index 411cbc91954d4..c7ed1f5bfa0b0 100644 --- a/src/cls/log/cls_log.cc +++ b/src/cls/log/cls_log.cc @@ -200,9 +200,7 @@ static int cls_log_list(cls_method_context_t hctx, bufferlist *in, bufferlist *o } } - if (ret.truncated) { - ret.marker = marker; - } + ret.marker = marker; ::encode(ret, *out); -- 2.39.5