]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: reshard list may return more than specified max_entries. 31355/head
authorzhangshaowen <zhangshaowen@cmss.chinamobile.com>
Mon, 4 Nov 2019 11:45:03 +0000 (19:45 +0800)
committerzhangshaowen <zhangshaowen@cmss.chinamobile.com>
Mon, 4 Nov 2019 11:45:03 +0000 (19:45 +0800)
Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_admin.cc

index 2c1ed88f55702b856ec646beccb7bee4089b451b..2d0c0630e978ff9806bd75744cb2ba21c473cba8 100644 (file)
@@ -6355,7 +6355,7 @@ next:
       string marker;
       do {
         entries.clear();
-        ret = reshard.list(i, marker, max_entries, entries, &is_truncated);
+        ret = reshard.list(i, marker, max_entries - count, entries, &is_truncated);
         if (ret < 0) {
           cerr << "Error listing resharding buckets: " << cpp_strerror(-ret) << std::endl;
           return ret;