This is an automated email from the ASF dual-hosted git repository.
wanghailin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new c6b03e9d6a [Improve][Zeta] Expose client
cluster-connect-timeout-millis to yaml (#5868)
c6b03e9d6a is described below
commit c6b03e9d6a9469bbcecb06e3a989abc220300f4b
Author: Wenjun Ruan <[email protected]>
AuthorDate: Fri Nov 17 15:28:26 2023 +0800
[Improve][Zeta] Expose client cluster-connect-timeout-millis to yaml (#5868)
---
config/hazelcast-client.yaml | 3 +++
.../seatunnel/engine/client/SeaTunnelHazelcastClient.java | 14 +++-----------
.../src/main/resources/hazelcast-client.yaml | 3 +++
.../common/config/YamlSeaTunnelConfigParserTest.java | 6 ++++++
.../src/test/resources/custmoize-client.yaml | 4 +++-
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/config/hazelcast-client.yaml b/config/hazelcast-client.yaml
index f4807790a6..9fb882ab24 100644
--- a/config/hazelcast-client.yaml
+++ b/config/hazelcast-client.yaml
@@ -19,6 +19,9 @@ hazelcast-client:
cluster-name: seatunnel
properties:
hazelcast.logging.type: log4j2
+ connection-strategy:
+ connection-retry:
+ cluster-connect-timeout-millis: 3000
network:
cluster-members:
- localhost:5801
\ No newline at end of file
diff --git
a/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelHazelcastClient.java
b/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelHazelcastClient.java
index 75111fe484..41bb5b9bc2 100644
---
a/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelHazelcastClient.java
+++
b/seatunnel-engine/seatunnel-engine-client/src/main/java/org/apache/seatunnel/engine/client/SeaTunnelHazelcastClient.java
@@ -20,6 +20,7 @@ package org.apache.seatunnel.engine.client;
import org.apache.seatunnel.engine.common.utils.ExceptionUtil;
import org.apache.seatunnel.engine.common.utils.PassiveCompletableFuture;
+import com.hazelcast.client.HazelcastClient;
import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.client.impl.ClientDelegatingFuture;
import com.hazelcast.client.impl.clientside.ClientMessageDecoder;
@@ -40,19 +41,10 @@ public class SeaTunnelHazelcastClient {
private final HazelcastClientInstanceImpl hazelcastClient;
private final SerializationService serializationService;
- private static final int CONNECT_TIMEOUT = 3000;
-
public SeaTunnelHazelcastClient(@NonNull ClientConfig clientConfig) {
- Preconditions.checkNotNull(clientConfig, "config");
- clientConfig
- .getConnectionStrategyConfig()
- .getConnectionRetryConfig()
- .setClusterConnectTimeoutMillis(CONNECT_TIMEOUT);
+ Preconditions.checkNotNull(clientConfig, "hazelcast client config
cannot be null");
this.hazelcastClient =
- ((HazelcastClientProxy)
-
com.hazelcast.client.HazelcastClient.newHazelcastClient(
- clientConfig))
- .client;
+ ((HazelcastClientProxy)
HazelcastClient.newHazelcastClient(clientConfig)).client;
this.serializationService = hazelcastClient.getSerializationService();
ExceptionUtil.registerSeaTunnelExceptions(hazelcastClient.getClientExceptionFactory());
}
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast-client.yaml
b/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast-client.yaml
index 1a31be9f6e..38686203cd 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast-client.yaml
+++
b/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast-client.yaml
@@ -19,6 +19,9 @@ hazelcast-client:
cluster-name: seatunnel
properties:
hazelcast.logging.type: log4j2
+ connection-strategy:
+ connection-retry:
+ cluster-connect-timeout-millis: 3000
network:
cluster-members:
- localhost:5801
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/test/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelConfigParserTest.java
b/seatunnel-engine/seatunnel-engine-common/src/test/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelConfigParserTest.java
index ed6853e39b..3fe398cafe 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/test/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelConfigParserTest.java
+++
b/seatunnel-engine/seatunnel-engine-common/src/test/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelConfigParserTest.java
@@ -78,5 +78,11 @@ public class YamlSeaTunnelConfigParserTest {
ClientConfig clientConfig = yamlClientConfigBuilder.build();
Assertions.assertEquals("custmoize", clientConfig.getClusterName());
+ Assertions.assertEquals(
+ 3000L,
+ clientConfig
+ .getConnectionStrategyConfig()
+ .getConnectionRetryConfig()
+ .getClusterConnectTimeoutMillis());
}
}
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml
b/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml
index e44281d9a8..55dd529622 100644
---
a/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml
+++
b/seatunnel-engine/seatunnel-engine-common/src/test/resources/custmoize-client.yaml
@@ -17,7 +17,9 @@
hazelcast-client:
cluster-name: custmoize
-
+ connection-strategy:
+ connection-retry:
+ cluster-connect-timeout-millis: 3000
network:
cluster-members:
- host:5801
