fix elasticsearch connection errors

indexer-core/src/main/java/org/opengroup/osdu/indexer/cache/ElasticsearchClientCache.java

@@ -18,11 +18,11 @@
 package org.opengroup.osdu.indexer.cache;
 
 import static org.opengroup.osdu.indexer.model.Constants.CLIENT_CACHE_EXPIRATION;
-import static org.opengroup.osdu.indexer.model.Constants.CLIENT_CACHE_SIZE;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import org.opengroup.osdu.core.common.cache.ICache;
 import org.opengroup.osdu.core.common.cache.VmCache;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -30,8 +30,11 @@ public class ElasticsearchClientCache implements ICache<String, ElasticsearchCli
 
   private final VmCache<String, ElasticsearchClient> vmCache;
 
+  @Value("${elasticsearch.client.cache.size:50}")
+  private int clientCacheSize;
+
   public ElasticsearchClientCache() {
-    this.vmCache = new VmCache<>(CLIENT_CACHE_EXPIRATION, CLIENT_CACHE_SIZE);
+    this.vmCache = new VmCache<>(CLIENT_CACHE_EXPIRATION, clientCacheSize);
   }
 
   @Override

indexer-core/src/main/java/org/opengroup/osdu/indexer/model/Constants.java

@@ -25,7 +25,6 @@ public class Constants {
     public static final int SPEC_MAX_CACHE_SIZE = 20000;
 
     public static final int CLIENT_CACHE_EXPIRATION = 600;
-    public static final int CLIENT_CACHE_SIZE = 50;
 
     // Data id itself is partition safe
     public static final int DATA_CACHE_EXPIRATION = 120;

indexer-core/src/main/java/org/opengroup/osdu/indexer/service/IndicesServiceImpl.java

@@ -327,14 +327,13 @@ public class IndicesServiceImpl implements IndicesService {
             ? "/_cat/indices/*,-.*?h=index,docs.count,creation.date&s=docs.count:asc&format=json"
             : String.format("/_cat/indices/%s?h=index,docs.count,creation.date&format=json", indexPattern);
 
-        try (RestClientTransport clientTransport = (RestClientTransport)client._transport()){
-            Request request = new Request("GET", requestUrl);
-            Response response = clientTransport.restClient().performRequest(request);
-            String responseBody = EntityUtils.toString(response.getEntity());
+        RestClientTransport clientTransport = (RestClientTransport)client._transport();
+        Request request = new Request("GET", requestUrl);
+        Response response = clientTransport.restClient().performRequest(request);
+        String responseBody = EntityUtils.toString(response.getEntity());
 
-            Type typeOf = new TypeToken<List<IndexInfo>>() {}.getType();
-            return new Gson().fromJson(responseBody, typeOf);
-        }
+        Type typeOf = new TypeToken<List<IndexInfo>>() {}.getType();
+        return new Gson().fromJson(responseBody, typeOf);
     }
 
     private void clearCacheOnIndexDeletion(String index) {

indexer-core/src/main/java/org/opengroup/osdu/indexer/util/ElasticClientHandler.java

@@ -8,6 +8,7 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.Base64;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import lombok.extern.java.Log;
 import org.apache.http.Header;
@@ -15,6 +16,7 @@ import org.apache.http.HttpHost;
 import org.apache.http.HttpStatus;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.TrustSelfSignedStrategy;
+import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.apache.http.message.BasicHeader;
 import org.apache.http.ssl.SSLContextBuilder;
 import org.elasticsearch.client.RestClient;
@@ -37,6 +39,7 @@ public class ElasticClientHandler {
   private static final int REST_CLIENT_CONNECT_TIMEOUT = 60000;
   private static final int REST_CLIENT_SOCKET_TIMEOUT = 60000;
   private static final int REST_CLIENT_RETRY_TIMEOUT = 60000;
+  private static final int REST_CLIENT_CONNECTION_TTL_SECONDS = 60;
 
   @Value("#{new Boolean('${security.https.certificate.trust:false}')}")
   private Boolean isSecurityHttpsCertificateTrust;
@@ -126,13 +129,16 @@ public class ElasticClientHandler {
         "Elastic client connection uses protocolScheme = %s with a flag "
             + "'security.https.certificate.trust' = %s",
         protocolScheme, isSecurityHttpsCertificateTrust));
+    HttpAsyncClientBuilder httpAsyncClientBuilder = HttpAsyncClientBuilder.create();
+    httpAsyncClientBuilder.setConnectionTimeToLive(REST_CLIENT_CONNECTION_TTL_SECONDS, TimeUnit.SECONDS);
     if ("https".equals(protocolScheme) && isSecurityHttpsCertificateTrust) {
       log.fine( "Elastic client connection uses TrustSelfSignedStrategy()");
       SSLContext sslContext = createSSLContext();
-      builder.setHttpClientConfigCallback(httpClientBuilder ->
-          httpClientBuilder.setSSLContext(sslContext)
-              .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE));
+      httpAsyncClientBuilder
+          .setSSLContext(sslContext)
+          .setSSLHostnameVerifier(NoopHostnameVerifier.INSTANCE);
     }
+    builder.setHttpClientConfigCallback(httpClientBuilder -> httpAsyncClientBuilder);
 
     builder.setDefaultHeaders(defaultHeaders);
     return builder;

provider/indexer-azure/src/main/resources/application.properties

@@ -115,4 +115,6 @@ api.server.fullUrl.enabled=${swaggerFullUrlEnabled:true}
 
 #Retry settings
 azure.storage.client.retry.MAX_ATTEMPTS=3
-azure.storage.client.retry.INITIAL_DELAY=1000
\ No newline at end of file
+azure.storage.client.retry.INITIAL_DELAY=1000
+
+elasticsearch.client.cache.size=100
\ No newline at end of file