You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/01/06 07:23:44 UTC
[shardingsphere] branch master updated: Remove pushTimeout in
ServerConfiguration. (#8907)
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 4355565 Remove pushTimeout in ServerConfiguration. (#8907)
4355565 is described below
commit 435556540734ca038bc9a2b2a289a708796a80c3
Author: 邱鹿 Lucas <lu...@163.com>
AuthorDate: Wed Jan 6 15:23:01 2021 +0800
Remove pushTimeout in ServerConfiguration. (#8907)
Co-authored-by: qiulu3 <Lucas209910>
---
docs/document/content/user-manual/shardingsphere-scaling/build.cn.md | 2 --
docs/document/content/user-manual/shardingsphere-scaling/build.en.md | 2 --
.../src/main/resources/conf/server.yaml | 1 -
.../src/main/resources/conf/server.yaml | 1 -
.../apache/shardingsphere/scaling/core/config/ServerConfiguration.java | 2 --
.../scaling/core/config/yaml/ServerConfigurationYamlSwapper.java | 2 --
.../scaling/core/config/yaml/YamlServerConfiguration.java | 2 --
7 files changed, 12 deletions(-)
diff --git a/docs/document/content/user-manual/shardingsphere-scaling/build.cn.md b/docs/document/content/user-manual/shardingsphere-scaling/build.cn.md
index ce3a477..72f7a91 100644
--- a/docs/document/content/user-manual/shardingsphere-scaling/build.cn.md
+++ b/docs/document/content/user-manual/shardingsphere-scaling/build.cn.md
@@ -22,7 +22,6 @@ mvn clean install -Prelease;
```
port: 8888
blockQueueSize: 10000
-pushTimeout: 1000
workerThread: 30
resumeBreakPoint:
@@ -68,7 +67,6 @@ curl -X GET http://localhost:8888/scaling/job/list
| -------------- | -------------------------------------- | ------ |
| port | HTTP服务监听端口 | 8888 |
| blockQueueSize | 数据传输通道队列大小 | 10000 |
-| pushTimeout | 数据推送超时时间，单位：毫秒 | 1000 |
| workerThread | 工作线程池大小，允许同时运行的迁移任务线程数 | 30 |
| resumeBreakPoint | 断点续传服务 | |
diff --git a/docs/document/content/user-manual/shardingsphere-scaling/build.en.md b/docs/document/content/user-manual/shardingsphere-scaling/build.en.md
index 46c68ae..8133449 100644
--- a/docs/document/content/user-manual/shardingsphere-scaling/build.en.md
+++ b/docs/document/content/user-manual/shardingsphere-scaling/build.en.md
@@ -21,7 +21,6 @@ The binary package's directory is:`/shardingsphere-distribution/shardingsphere-s
```
port: 8888
blockQueueSize: 10000
-pushTimeout: 1000
workerThread: 30
resumeBreakPoint:
@@ -67,6 +66,5 @@ response:
| -------------- | ----------------------------------------------------------------------------------------- | ------------- |
| port | Listening port of HTTP server | 8888 |
| blockQueueSize | Queue size of data transmission channel | 10000 |
-| pushTimeout | Data push timeout(ms) | 1000 |
| workerThread | Worker thread pool size, the number of migration task threads allowed to run concurrently | 30 |
| resumeBreakPoint | Resume from break-point service | |
diff --git a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/conf/server.yaml b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/conf/server.yaml
index 7958b00..678ba4d 100644
--- a/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/conf/server.yaml
+++ b/shardingsphere-distribution/shardingsphere-scaling-distribution/src/main/resources/conf/server.yaml
@@ -17,7 +17,6 @@
port: 8888
blockQueueSize: 10000
-pushTimeout: 1000
workerThread: 30
#distributedScalingService:
diff --git a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/resources/conf/server.yaml b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/resources/conf/server.yaml
index 7958b00..678ba4d 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/resources/conf/server.yaml
+++ b/shardingsphere-scaling/shardingsphere-scaling-bootstrap/src/main/resources/conf/server.yaml
@@ -17,7 +17,6 @@
port: 8888
blockQueueSize: 10000
-pushTimeout: 1000
workerThread: 30
#distributedScalingService:
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java
index ce99ce0..9095496 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/ServerConfiguration.java
@@ -32,8 +32,6 @@ public final class ServerConfiguration {
private int blockQueueSize = 10000;
- private int pushTimeout = 1000;
-
private int workerThread = 30;
private GovernanceConfiguration distributedScalingService;
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/ServerConfigurationYamlSwapper.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/ServerConfigurationYamlSwapper.java
index e2f2b58..2e997b1 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/ServerConfigurationYamlSwapper.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/ServerConfigurationYamlSwapper.java
@@ -32,7 +32,6 @@ public final class ServerConfigurationYamlSwapper implements YamlSwapper<YamlSer
YamlServerConfiguration result = new YamlServerConfiguration();
result.setPort(data.getPort());
result.setBlockQueueSize(data.getBlockQueueSize());
- result.setPushTimeout(data.getPushTimeout());
result.setWorkerThread(data.getWorkerThread());
if (null != data.getDistributedScalingService()) {
result.setDistributedScalingService(governanceConfigurationYamlSwapper.swapToYamlConfiguration(data.getDistributedScalingService()));
@@ -45,7 +44,6 @@ public final class ServerConfigurationYamlSwapper implements YamlSwapper<YamlSer
ServerConfiguration result = new ServerConfiguration();
result.setPort(yamlConfig.getPort());
result.setBlockQueueSize(yamlConfig.getBlockQueueSize());
- result.setPushTimeout(yamlConfig.getPushTimeout());
result.setWorkerThread(yamlConfig.getWorkerThread());
if (null != yamlConfig.getDistributedScalingService()) {
result.setDistributedScalingService(governanceConfigurationYamlSwapper.swapToObject(yamlConfig.getDistributedScalingService()));
diff --git a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/YamlServerConfiguration.java b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/YamlServerConfiguration.java
index b1e84e6..98517e3 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/YamlServerConfiguration.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-core/src/main/java/org/apache/shardingsphere/scaling/core/config/yaml/YamlServerConfiguration.java
@@ -32,8 +32,6 @@ public final class YamlServerConfiguration implements YamlConfiguration {
private int blockQueueSize = 10000;
- private int pushTimeout = 1000;
-
private int workerThread = 30;
private YamlGovernanceConfiguration distributedScalingService;