]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cls/rgw: fix bi_log_iterate_entries return wrong truncated 21054/head
authorTianshan Qu <tianshan@xsky.com>
Fri, 19 Jan 2018 05:46:06 +0000 (13:46 +0800)
committerPrashant D <pdhange@redhat.com>
Tue, 27 Mar 2018 05:30:19 +0000 (01:30 -0400)
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)

src/cls/rgw/cls_rgw.cc

index 564e81d179dc2ba0c0077e6ada781543610b296e..d152604f80e791651c72e4ffc660b66ec704c5da 100644 (file)
@@ -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;
     }