From d7a7e9372abfb84c2a4c5598279f0b0d89851743 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Wed, 12 Apr 2017 15:36:45 +0100 Subject: [PATCH 1/2] HSEARCH-2681 Improve Elasticsearch backend diagnostic --- .../elasticsearch/client/impl/DefaultElasticsearchClient.java | 1 + .../search/elasticsearch/testutil/ImportedTestRunner.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java index d15f8138c83..08678e46416 100644 --- a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java +++ b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClient.java @@ -61,6 +61,7 @@ public Response execute(ElasticsearchRequest request) throws IOException { ); } catch (ResponseException e) { + requestLog.debug( "ES client issued a ResponseException - not necessarily a problem", e ); /* * The client tries to guess what's an error and what's not, but it's too naive. * A 404 on DELETE is not always important to us, for instance. diff --git a/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java b/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java index ef7edae19be..1ed383b9e5e 100644 --- a/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java +++ b/elasticsearch/src/test/java/org/hibernate/search/elasticsearch/testutil/ImportedTestRunner.java @@ -21,7 +21,7 @@ *

Adapt the classname filter as needed to run a single test or an entire test package. * *

Running such tests from the IDE will require having an Elasticsearch - * node running. You can easily start one by running 'mvn elasticsearch:run' + * node running. You can easily start one by running 'mvn elasticsearch:runforked' * from the elasticsearch module in this project. * * @author Gunnar Morling From f7d7f053787baf9ad6a8492b3d8472baa601e0fe Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Wed, 12 Apr 2017 15:07:25 +0100 Subject: [PATCH 2/2] HSEARCH-2681 Disable lease handling on the Non-blocking HTTP client connection pool --- .../client/impl/DefaultElasticsearchClientFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java index b89a8e628a4..3506e40bd42 100644 --- a/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java +++ b/elasticsearch/src/main/java/org/hibernate/search/elasticsearch/client/impl/DefaultElasticsearchClientFactory.java @@ -147,6 +147,7 @@ private HttpAsyncClientBuilder customizeHttpClientConfig(String propertyPrefix, private RequestConfig.Builder customizeRequestConfig(String propertyPrefix, Properties properties, RequestConfig.Builder builder) { return builder + .setConnectionRequestTimeout( 0 ) //Disable lease handling for the connection pool! See also HSEARCH-2681 .setSocketTimeout( ConfigurationParseHelper.getIntValue( properties, propertyPrefix + ElasticsearchEnvironment.SERVER_READ_TIMEOUT,