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

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

commit df3355e8e107d788f8e51421f3059494896fd6a2
Author: Jared.Tan <jian....@daocloud.io>
AuthorDate: Fri Nov 1 17:09:17 2019 +0800

    fix elasticsearch query data window size too large error.
---
 .../plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java   | 2 +-
 .../storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
index 58154d0..b799d16 100644
--- 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
@@ -84,7 +84,7 @@ public class NetworkAddressInventoryCacheEsDAO extends EsDAO 
implements INetwork
         try {
             SearchSourceBuilder searchSourceBuilder = new 
SearchSourceBuilder();
             
searchSourceBuilder.query(QueryBuilders.rangeQuery(NetworkAddressInventory.LAST_UPDATE_TIME).gte(lastUpdateTime));
-            searchSourceBuilder.size(Integer.MAX_VALUE);
+            searchSourceBuilder.size(10000);
 
             SearchResponse response = 
getClient().search(NetworkAddressInventory.INDEX_NAME, searchSourceBuilder);
 
diff --git 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
index f20d9d1..7f34c80 100644
--- 
a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
@@ -99,7 +99,7 @@ public class ServiceInventoryCacheEsDAO extends EsDAO 
implements IServiceInvento
             
boolQuery.must().add(QueryBuilders.rangeQuery(ServiceInventory.LAST_UPDATE_TIME).gte(lastUpdateTime));
 
             searchSourceBuilder.query(boolQuery);
-            searchSourceBuilder.size(Integer.MAX_VALUE);
+            searchSourceBuilder.size(10000);
 
             SearchResponse response = 
getClient().search(ServiceInventory.INDEX_NAME, searchSourceBuilder);
 

Reply via email to