This is an automated email from the ASF dual-hosted git repository.
liugddx pushed a commit to branch revert-4152-revert-4043
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
commit 9954a1e0e56a9d279dbc9f39c32d233fa6867f3d
Author: Guangdong Liu <804167...@qq.com>
AuthorDate: Sat Feb 18 17:38:28 2023 +0800
Revert "Revert "[Improve][Zeta][Config] change Zeta config (#4043)" (#4152)"
This reverts commit 9433fa24f534f206422a33812e0dc96d62622d78.
---
config/hazelcast-client.yaml | 2 +-
config/hazelcast.yaml | 29 +++++++++++----
docs/en/seatunnel-engine/deployment.md | 2 +-
docs/en/seatunnel-engine/{tcp.md => network.md} | 43 +++++++++++++++++++++-
docs/sidebars.js | 2 +-
.../src/test/resources/hazelcast-client.yaml | 2 +-
.../src/test/resources/hazelcast.yaml | 29 ++++++++++++---
.../src/main/resources/hazelcast.yaml | 30 +++++++++++----
.../src/test/resources/custmoize-client.yaml | 31 ++++++++--------
.../src/test/resources/hazelcast.yaml | 31 +++++++++++++---
10 files changed, 154 insertions(+), 47 deletions(-)
diff --git a/config/hazelcast-client.yaml b/config/hazelcast-client.yaml
index f4807790a..c4226f004 100644
--- a/config/hazelcast-client.yaml
+++ b/config/hazelcast-client.yaml
@@ -21,4 +21,4 @@ hazelcast-client:
hazelcast.logging.type: log4j2
network:
cluster-members:
- - localhost:5801
\ No newline at end of file
+ - localhost:5801
diff --git a/config/hazelcast.yaml b/config/hazelcast.yaml
index d0d274358..bd92adf9e 100644
--- a/config/hazelcast.yaml
+++ b/config/hazelcast.yaml
@@ -17,20 +17,35 @@
hazelcast:
cluster-name: seatunnel
- network:
- rest-api:
- enabled: true
+ advanced-network:
+ enabled: true
+ member-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 9000
+ client-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5801
+ rest-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 8080
endpoint-groups:
- CLUSTER_WRITE:
+ WAN:
+ enabled: true
+ CLUSTER_READ:
+ enabled: true
+ HEALTH_CHECK:
enabled: true
join:
tcp-ip:
enabled: true
member-list:
- localhost
- port:
- auto-increment: false
- port: 5801
properties:
hazelcast.invocation.max.retry.count: 20
hazelcast.tcp.join.port.try.count: 30
diff --git a/docs/en/seatunnel-engine/deployment.md
b/docs/en/seatunnel-engine/deployment.md
index d537a6b4b..600444060 100644
--- a/docs/en/seatunnel-engine/deployment.md
+++ b/docs/en/seatunnel-engine/deployment.md
@@ -132,7 +132,7 @@ SeaTunnel Engine uses the following discovery mechanisms.
#### TCP
-You can configure SeaTunnel Engine to be a full TCP/IP cluster. See the
[Discovering Members by TCP section](tcp.md) for configuration details.
+You can configure SeaTunnel Engine to be a full TCP/IP cluster. See the
[Discovering Members by TCP section](network.md) for configuration details.
An example is like this `hazelcast.yaml`
diff --git a/docs/en/seatunnel-engine/tcp.md
b/docs/en/seatunnel-engine/network.md
similarity index 60%
rename from docs/en/seatunnel-engine/tcp.md
rename to docs/en/seatunnel-engine/network.md
index d680668d2..ba2383c2c 100644
--- a/docs/en/seatunnel-engine/tcp.md
+++ b/docs/en/seatunnel-engine/network.md
@@ -3,7 +3,7 @@
sidebar_position: 6
-------------------
-# TCP NetWork
+## TCP NetWork
If multicast is not the preferred way of discovery for your environment, then
you can configure SeaTunnel Engine to be a full TCP/IP cluster. When you
configure SeaTunnel Engine to discover members by TCP/IP, you must list all or
a subset of the members' host names and/or IP addresses as cluster members. You
do not have to list all of these cluster members, but at least one of the
listed members has to be active in the cluster when a new member joins.
@@ -16,7 +16,8 @@ The following is an example declarative configuration.
```yaml
hazelcast:
- network:
+ advanced-network:
+ enabled: true
join:
tcp-ip:
enabled: true
@@ -35,3 +36,41 @@ Instead of providing members line-by-line as shown above,
you also have the opti
`<members>192.168.1.0-7,192.168.1.21</members>`
If you do not provide ports for the members, Hazelcast automatically tries the
ports `5701`, `5702` and so on.
+
+## Advanced Network Configuration
+
+Different kinds of network connections can be established with different
socket options.
+
+When using the declarative configuration, specific element names introduce the
server socket endpoint configuration for each protocol:
+
+- member-server-socket-endpoint-config for MEMBER protocol
+
+- client-server-socket-endpoint-config for CLIENT protocol
+
+- rest-server-socket-endpoint-config for REST endpoint
+
+```yaml
+member-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 9000
+ client-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5801
+ rest-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 8080
+ endpoint-groups:
+ WAN:
+ enabled: true
+ CLUSTER_READ:
+ enabled: true
+ HEALTH_CHECK:
+ enabled: true
+```
+
diff --git a/docs/sidebars.js b/docs/sidebars.js
index 550e02338..4374d411f 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -170,7 +170,7 @@ const sidebars = {
"seatunnel-engine/local-mode",
"seatunnel-engine/cluster-mode",
"seatunnel-engine/checkpoint-storage",
- "seatunnel-engine/tcp"
+ "seatunnel-engine/network"
]
},
{
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml
index 1834d9c94..9552c382e 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml
+++
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast-client.yaml
@@ -34,4 +34,4 @@ hazelcast-client:
- localhost:5812
- localhost:5813
- localhost:5814
- - localhost:5815
\ No newline at end of file
+ - localhost:5815
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml
index e83cc722e..aaf2c81e3 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml
+++
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/hazelcast.yaml
@@ -17,16 +17,35 @@
hazelcast:
cluster-name: seatunnel
- network:
+ advanced-network:
+ enabled: true
+ member-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 9000
+ client-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5801
+ rest-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 8080
+ endpoint-groups:
+ WAN:
+ enabled: true
+ CLUSTER_READ:
+ enabled: true
+ HEALTH_CHECK:
+ enabled: true
join:
tcp-ip:
enabled: true
member-list:
- localhost
- port:
- auto-increment: true
- port-count: 100
- port: 5801
properties:
hazelcast.invocation.max.retry.count: 200
hazelcast.invocation.retry.pause.millis: 2000
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml
b/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml
index bd2be411f..f22a8d3f1 100644
--- a/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml
+++ b/seatunnel-engine/seatunnel-engine-common/src/main/resources/hazelcast.yaml
@@ -17,11 +17,29 @@
hazelcast:
cluster-name: seatunnel
- network:
- rest-api:
- enabled: true
+ advanced-network:
+ enabled: true
+ member-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 9000
+ client-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5801
+ rest-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 8080
endpoint-groups:
- CLUSTER_WRITE:
+ WAN:
+ enabled: true
+ CLUSTER_READ:
+ enabled: true
+ HEALTH_CHECK:
enabled: true
DATA:
enabled: true
@@ -30,10 +48,6 @@ hazelcast:
enabled: true
member-list:
- localhost
- port:
- auto-increment: true
- port-count: 100
- port: 5801
properties:
hazelcast.invocation.max.retry.count: 20
hazelcast.tcp.join.port.try.count: 30
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 e44281d9a..bfedacbd7 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
@@ -20,18 +20,19 @@ hazelcast-client:
network:
cluster-members:
- - host:5801
- - host:5802
- - host:5803
- - host:5804
- - host:5805
- - host:5806
- - host:5807
- - host:5808
- - host:5809
- - host:5810
- - host:5811
- - host:5812
- - host:5813
- - host:5814
- - host:5815
+ - host:9000
+ - host:9001
+ - host:9002
+ - host:9003
+ - host:9004
+ - host:9005
+ - host:9006
+ - host:9007
+ - host:9008
+ - host:9009
+ - host:9010
+ - host:9011
+ - host:9012
+ - host:9013
+ - host:9014
+ - host:9015
diff --git
a/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml
b/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml
index 21f4d544d..a13b0a90d 100644
--- a/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml
+++ b/seatunnel-engine/seatunnel-engine-common/src/test/resources/hazelcast.yaml
@@ -17,16 +17,35 @@
hazelcast:
cluster-name: seatunnel
- network:
+ advanced-network:
+ enabled: true
+ member-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 9000
+ client-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 5801
+ rest-server-socket-endpoint-config:
+ port:
+ auto-increment: true
+ port-count: 100
+ port: 8080
+ endpoint-groups:
+ WAN:
+ enabled: true
+ CLUSTER_READ:
+ enabled: true
+ HEALTH_CHECK:
+ enabled: true
join:
tcp-ip:
enabled: true
member-list:
- localhost
- port:
- auto-increment: true
- port-count: 100
- port: 5801
map:
map-name-template:
map-store:
@@ -34,4 +53,4 @@ hazelcast:
initial-mode: EAGER
class-name: org.apache.seatunnel.engine.server.persistence.FileMapStore
properties:
- path: /tmp/file-store-map
\ No newline at end of file
+ path: /tmp/file-store-map
