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

mmarshall pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new dbe1c0abb96 [fix][io] Update Elasticsearch sink idle cnx timeout to 
30s (#19377)
dbe1c0abb96 is described below

commit dbe1c0abb96d2dda4cd2a893ac52d903d086fc02
Author: Michael Marshall <[email protected]>
AuthorDate: Tue Jan 31 15:35:49 2023 -0600

    [fix][io] Update Elasticsearch sink idle cnx timeout to 30s (#19377)
    
    (cherry picked from commit 1481c7480ec586bb63d2efec711b2379683d5cba)
---
 .../org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java     | 6 +++---
 .../java/org/apache/pulsar/io/elasticsearch/client/RestClient.java  | 1 -
 .../apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
 
b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
index e7ea0fbaca0..01c2ca9109d 100644
--- 
a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
+++ 
b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfig.java
@@ -214,10 +214,10 @@ public class ElasticSearchConfig implements Serializable {
 
     @FieldDoc(
             required = false,
-            defaultValue = "5",
-            help = "Idle connection timeout to prevent a read timeout."
+            defaultValue = "30000",
+            help = "Idle connection timeout to prevent a connection timeout 
due to inactivity."
     )
-    private int connectionIdleTimeoutInMs = 5;
+    private int connectionIdleTimeoutInMs = 30000;
 
     @FieldDoc(
             required = false,
diff --git 
a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
 
b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
index 561358a3e5c..f6d819a3f92 100644
--- 
a/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
+++ 
b/pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
@@ -83,7 +83,6 @@ public abstract class RestClient implements Closeable {
         // idle+expired connection evictor thread
         this.executorService = Executors.newSingleThreadScheduledExecutor();
         this.executorService.scheduleAtFixedRate(() -> {
-                    configCallback.connectionManager.closeExpiredConnections();
                     configCallback.connectionManager.closeIdleConnections(
                             config.getConnectionIdleTimeoutInMs(), 
TimeUnit.MILLISECONDS);
                 },
diff --git 
a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
 
b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
index d152b936857..9ef1bf150c3 100644
--- 
a/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
+++ 
b/pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchConfigTests.java
@@ -92,7 +92,7 @@ public class ElasticSearchConfigTests {
         assertEquals(config.isCompressionEnabled(), false);
         assertEquals(config.getConnectTimeoutInMs(), 5000L);
         assertEquals(config.getConnectionRequestTimeoutInMs(), 1000L);
-        assertEquals(config.getConnectionIdleTimeoutInMs(), 5L);
+        assertEquals(config.getConnectionIdleTimeoutInMs(), 30000L);
         assertEquals(config.getSocketTimeoutInMs(), 60000);
 
         assertEquals(config.isStripNulls(), true);

Reply via email to