You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2020/04/24 10:04:42 UTC
[unomi] branch UNOMI-327-various-quality-issues created (now
3a00eb0)
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a change to branch UNOMI-327-various-quality-issues
in repository https://gitbox.apache.org/repos/asf/unomi.git.
at 3a00eb0 UNOMI-327 - Change heap size from 512MB (default) to 2GB - Catch ElasticsearchStatusException and in the case of an index not found we simply return null, in all other cases we raise the exception - Fix scroll identifier leak when query returns no results.
This branch includes the following new commits:
new 3a00eb0 UNOMI-327 - Change heap size from 512MB (default) to 2GB - Catch ElasticsearchStatusException and in the case of an index not found we simply return null, in all other cases we raise the exception - Fix scroll identifier leak when query returns no results.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[unomi] 01/01: UNOMI-327 - Change heap size from 512MB (default) to
2GB - Catch ElasticsearchStatusException and in the case of an index not
found we simply return null,
in all other cases we raise the exception - Fix scroll identifier leak when
query returns no results.
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shuber pushed a commit to branch UNOMI-327-various-quality-issues
in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 3a00eb0236151c8a0352a928c4bc30b4ee8c2c0b
Author: Serge Huber <sh...@apache.org>
AuthorDate: Fri Apr 24 12:04:35 2020 +0200
UNOMI-327
- Change heap size from 512MB (default) to 2GB
- Catch ElasticsearchStatusException and in the case of an index not found we simply return null, in all other cases we raise the exception
- Fix scroll identifier leak when query returns no results.
---
package/src/main/resources/bin/setenv | 4 +++-
package/src/main/resources/bin/setenv.bat | 2 +-
.../elasticsearch/ElasticSearchPersistenceServiceImpl.java | 14 ++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/package/src/main/resources/bin/setenv b/package/src/main/resources/bin/setenv
index e48561d..8c5ba86 100755
--- a/package/src/main/resources/bin/setenv
+++ b/package/src/main/resources/bin/setenv
@@ -57,4 +57,6 @@ MY_KARAF_HOME=`cd "$MY_DIRNAME/.."; pwd`
# On Linux:
# export YOURKIT_AGENTPATH="/home/jahia/install/yourkit/YourKit-JavaProfiler-2017.02/bin/linux-x86-64/libyjpagent.so"
# Also activate this line to activate the agent on the JVM command line:
-# export KARAF_OPTS="-agentpath:$YOURKIT_AGENTPATH=disablestacktelemetry,exceptions=disable,delay=10000,probe_disable=*"
\ No newline at end of file
+# export KARAF_OPTS="-agentpath:$YOURKIT_AGENTPATH=disablestacktelemetry,exceptions=disable,delay=10000,probe_disable=*"
+
+export JAVA_MAX_MEM=2G
\ No newline at end of file
diff --git a/package/src/main/resources/bin/setenv.bat b/package/src/main/resources/bin/setenv.bat
index a7ae1f4..c73cd8b 100644
--- a/package/src/main/resources/bin/setenv.bat
+++ b/package/src/main/resources/bin/setenv.bat
@@ -43,7 +43,7 @@ rem SET JAVA_HOME
rem Minimum memory for the JVM
rem SET JAVA_MIN_MEM
rem Maximum memory for the JVM
-SET JAVA_MAX_MEM=3G
+SET JAVA_MAX_MEM=2G
rem Minimum perm memory for the JVM
rem SET JAVA_PERM_MEM
rem Maximum perm memory for the JVM
diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index 5917485..456a930 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -38,6 +38,7 @@ import org.apache.unomi.metrics.MetricsService;
import org.apache.unomi.persistence.elasticsearch.conditions.*;
import org.apache.unomi.persistence.spi.PersistenceService;
import org.apache.unomi.persistence.spi.aggregate.*;
+import org.elasticsearch.ElasticsearchStatusException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
@@ -72,6 +73,7 @@ import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.RangeQueryBuilder;
import org.elasticsearch.index.reindex.BulkByScrollResponse;
import org.elasticsearch.index.reindex.UpdateByQueryRequest;
+import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptException;
import org.elasticsearch.script.ScriptType;
@@ -688,6 +690,12 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
return null;
}
}
+ } catch (ElasticsearchStatusException ese) {
+ if (ese.status().equals(RestStatus.NOT_FOUND)) {
+ // this can happen if we are just testing the existence of the item, it is not always an error.
+ return null;
+ }
+ throw new Exception("Error loading itemType=" + clazz.getName() + " itemId=" + itemId, ese);
} catch (IndexNotFoundException e) {
// this can happen if we are just testing the existence of the item, it is not always an error.
return null;
@@ -1475,6 +1483,12 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
scrollIdentifier = response.getScrollId();
totalHits = searchHits.getTotalHits().value;
totalHitsRelation = getTotalHitsRelation(searchHits.getTotalHits());
+ if (scrollIdentifier != null && totalHits == 0) {
+ // we have no results, we must clear the scroll request immediately.
+ ClearScrollRequest clearScrollRequest = new ClearScrollRequest();
+ clearScrollRequest.addScrollId(response.getScrollId());
+ client.clearScroll(clearScrollRequest, RequestOptions.DEFAULT);
+ }
for (SearchHit searchHit : searchHits) {
String sourceAsString = searchHit.getSourceAsString();
final T value = ESCustomObjectMapper.getObjectMapper().readValue(sourceAsString, clazz);