]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cls/log: cls_log_list always returns next marker 17024/head
authorCasey Bodley <cbodley@redhat.com>
Mon, 14 Aug 2017 19:25:44 +0000 (15:25 -0400)
committerCasey Bodley <cbodley@redhat.com>
Mon, 14 Aug 2017 19:25:47 +0000 (15:25 -0400)
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>
src/cls/log/cls_log.cc

index 411cbc91954d4f57cb09ae6ae47f6dd6c73fd008..c7ed1f5bfa0b0e563a50d44449e73450d28daf26 100644 (file)
@@ -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);