From: liaoxin01 <liaoxin01@baidu.com>
Date: Thu, 5 Jul 2018 06:23:34 +0000 (+0800)
Subject: rgw: fix gc may cause a large number of read traffic
X-Git-Tag: v12.2.8~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4c3f6c11aa3f4e49343f90cdf4a2c412b905b352;p=ceph.git

rgw: fix gc may cause a large number of read traffic

fix http://tracker.ceph.com/issues/24767

Signed-off-by: Xin Liao <liaoxin01@baidu.com>
(cherry picked from commit afc3b1ab1f6b24267c5ab846e2e7a5de5ec9a5d0)
---

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index d7deb78f8b6f..b775d66d5828 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -3326,8 +3326,11 @@ static int gc_iterate_entries(cls_method_context_t hctx, const string& marker, b
 
     CLS_LOG(10, "gc_iterate_entries key=%s\n", key.c_str());
 
-    if (!end_key.empty() && key.compare(end_key) >= 0)
+    if (!end_key.empty() && key.compare(end_key) >= 0) {
+      if (truncated)
+        *truncated = false;
       return 0;
+    }
 
     if (!key_in_index(key, GC_OBJ_TIME_INDEX))
       return 0;