[skywalking] branch master updated: Fix ElasticSearch scroller bug (#10999)

[wusheng]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/master by this push:
     new d13d44828a Fix ElasticSearch scroller bug (#10999)
d13d44828a is described below

commit d13d44828ab113f5d690beba175ac151f6acc9c4
Author: kezhenxu94 <kezhenx...@apache.org>
AuthorDate: Mon Jun 26 19:55:21 2023 +0800

    Fix ElasticSearch scroller bug (#10999)
---
 docs/en/changes/changes.md                                              | 1 +
 .../oap/server/library/client/elasticsearch/ElasticSearchScroller.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 07d9cd7463..40f03c0d36 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -21,6 +21,7 @@
 * Support `SW_CORE_SYNC_PERIOD_HTTP_URI_RECOGNITION_PATTERN` and 
`SW_CORE_TRAINING_PERIOD_HTTP_URI_RECOGNITION_PATTERN`
   to control the period of training and sync HTTP URI recognition patterns. 
And shorten the default period to 10s for
   sync and 60s for training.
+* Fix ElasticSearch scroller bug.
 
 #### UI
 
diff --git 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
index 55eba02fd2..f414f4c502 100644
--- 
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
+++ 
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchScroller.java
@@ -62,7 +62,7 @@ public class ElasticSearchScroller<T> {
                 for (final var searchHit : response.getHits()) {
                     results.add(resultConverter.apply(searchHit));
                 }
-                if (search.getSize() != null && response.getHits().getTotal() 
< search.getSize()) {
+                if (search.getSize() != null && 
response.getHits().getHits().size() < search.getSize()) {
                     break;
                 }
                 if (queryMaxSize > 0 && results.size() >= queryMaxSize) {