From: Tianshan Qu <tianshan@xsky.com>
Date: Fri, 19 Jan 2018 05:46:06 +0000 (+0800)
Subject: cls/rgw: fix bi_log_iterate_entries return wrong truncated
X-Git-Tag: v12.2.5~66^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce67665b5d46df6ce7a8e973c2d6748bfd60b04e;p=ceph.git

cls/rgw: fix bi_log_iterate_entries return wrong truncated

if there are over 1000 entries of instance keys, cls_cxx_map_get_vals
will get truncated=true, but bilogs already reach the end.

fixes: http://tracker.ceph.com/issues/22737

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
(cherry picked from commit de791830097d9eec454ea7450f76c67508fa80fa)
---

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 564e81d179d..d152604f80e 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -2611,6 +2611,9 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
 
     if (key.compare(end_key) > 0) {
       key_iter = key;
+      if (truncated) {
+        *truncated = false;
+      }
       return 0;
     }