From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 14 Aug 2017 19:25:44 +0000 (-0400)
Subject: cls/log: cls_log_list always returns next marker
X-Git-Tag: v12.2.0~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F17234%2Fhead;p=ceph.git

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 <cbodley@redhat.com>
(cherry picked from commit f7ea4ea2b2264fc74beb04872246a853efb9206a)
---

diff --git a/src/cls/log/cls_log.cc b/src/cls/log/cls_log.cc
index 411cbc91954..c7ed1f5bfa0 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);