From 18abdedaf877e888b9ba9fd2e59360a643b8f521 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 28 Mar 2024 16:30:13 +0200 Subject: [PATCH] aligned timeouts with cache expire time --- .../search/v1/server/service/elasticsearch/EsClient.java | 7 +++++-- .../v1/server/service/opensearch/OpensearchClient.java | 7 ++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java index c28e29c..835dcf5 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/elasticsearch/EsClient.java @@ -24,6 +24,9 @@ import lombok.experimental.Delegate; @SuppressWarnings("PMD") public class EsClient { + // Lower timeouts should be set per request. + private static final int ABSURD_HIGH_TIMEOUT = 600_000; + private SearchConnection searchConnection; @Delegate @@ -39,8 +42,8 @@ public class EsClient { .toArray(new HttpHost[searchConnection.getHosts().size()]); var builder = RestClient.builder(httpHost) - .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(30_000) - .setSocketTimeout(120_000)); + .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(ABSURD_HIGH_TIMEOUT) + .setSocketTimeout(ABSURD_HIGH_TIMEOUT)); if (searchConnection.getUsername() != null && !searchConnection.getUsername().isEmpty()) { final CredentialsProvider credentialsProvider = new BasicCredentialsProvider(); diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java index 162867b..81d0fed 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/opensearch/OpensearchClient.java @@ -19,7 +19,7 @@ import org.opensearch.client.transport.rest_client.RestClientTransport; public class OpensearchClient { // Lower timeouts should be set per request. - private static final int ABSURD_HIGH_TIMEOUT = 90_000_000; + private static final int ABSURD_HIGH_TIMEOUT = 600_000; private SearchConnection searchConnection; @@ -36,8 +36,9 @@ public class OpensearchClient { .toArray(new HttpHost[searchConnection.getHosts().size()]); var builder = RestClient.builder(httpHost) - .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(30_000) - .setSocketTimeout(120_000)); + .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder.setConnectTimeout(0) + .setConnectionRequestTimeout(ABSURD_HIGH_TIMEOUT) + .setSocketTimeout(ABSURD_HIGH_TIMEOUT)); if (searchConnection.getUsername() != null && !searchConnection.getUsername().isEmpty()) { final CredentialsProvider credentialsProvider = new BasicCredentialsProvider();