This is an automated email from the ASF dual-hosted git repository.
jianbin pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/incubator-seata.git
The following commit(s) were added to refs/heads/2.x by this push:
new f3b27de772 bugfix: fix the problem that The incorrect configuration
needs to be fixed (#6204)
f3b27de772 is described below
commit f3b27de7725a1faeeeb7dc5501190b765d59377a
Author: dreamskyvision <dreamskyvis...@163.com>
AuthorDate: Mon Dec 25 17:25:02 2023 +0800
bugfix: fix the problem that The incorrect configuration needs to be fixed
(#6204)
---
changes/en-us/2.x.md | 2 ++
changes/zh-cn/2.x.md | 2 ++
script/config-center/config.txt | 2 +-
server/src/main/resources/application.example.yml | 14 --------------
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index 93dd17f4ff..54b1b7e19b 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -15,6 +15,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6121](https://github.com/apache/incubator-seata/pull/6121)] fix the
branch transaction order error when rolling back
- [[#6182](https://github.com/apache/incubator-seata/pull/6182)] fix
guava-32.0.0-jre.jar zip file is empty in ci
- [[#6196](https://github.com/apache/incubator-seata/pull/6196)] fix asf
config file format error
+- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] fix the
problem that The incorrect configuration needs to be fixed
### optimize:
- [[#6031](https://github.com/apache/incubator-seata/pull/6031)] add a check
for the existence of the undolog table
@@ -75,5 +76,6 @@ Thanks to these contributors for their code commits. Please
report an unintended
- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
- [PeppaO](https://github.com/PeppaO)
- [AlbumenJ](https://github.com/AlbumenJ)
+- [dreamskyvision](https://github.com/dreamskyvision)
Also, we receive many valuable issues, questions and advices from our
community. Thanks for you all.
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 632833f947..887c6e47b1 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -15,6 +15,7 @@
- [[#6121](https://github.com/apache/incubator-seata/pull/6121)]
修复回滚分支事务时没有按照时间排序的问题
- [[#6182](https://github.com/apache/incubator-seata/pull/6182)]
修复在ci中guava-32.0.0-jre.jar zip文件为空的问题
- [[#6196](https://github.com/apache/incubator-seata/pull/6196)] 修复asf配置格式错误的问题
+- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] 修复错误配置问题
### optimize:
- [[#6031](https://github.com/apache/incubator-seata/pull/6031)]
添加undo_log表的存在性校验
@@ -74,5 +75,6 @@
- [PleaseGiveMeTheCoke](https://github.com/PleaseGiveMeTheCoke)
- [PeppaO](https://github.com/PeppaO)
- [AlbumenJ](https://github.com/AlbumenJ)
+- [dreamskyvision](https://github.com/dreamskyvision)
同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。
diff --git a/script/config-center/config.txt b/script/config-center/config.txt
index 6a0d26b6ed..80a478ccb1 100644
--- a/script/config-center/config.txt
+++ b/script/config-center/config.txt
@@ -131,7 +131,7 @@ server.enableParallelHandleBranch=false
server.applicationDataLimit=64000
server.applicationDataLimitCheck=false
-server.raft.cluster=127.0.0.1:7091,127.0.0.1:7092,127.0.0.1:7093
+server.raft.server-addr=127.0.0.1:7091,127.0.0.1:7092,127.0.0.1:7093
server.raft.snapshotInterval=600
server.raft.applyBatch=32
server.raft.maxAppendBufferSize=262144
diff --git a/server/src/main/resources/application.example.yml
b/server/src/main/resources/application.example.yml
index 7d5ae8966f..fb4cfad34a 100644
--- a/server/src/main/resources/application.example.yml
+++ b/server/src/main/resources/application.example.yml
@@ -125,20 +125,6 @@ seata:
address-wait-time: 3000
server:
- raft:
- group: default
- cluster:
- snapshot-interval: 600
- apply-batch: 32
- max-append-bufferSize: 262144
- max-replicator-inflight-msgs: 256
- disruptor-buffer-size: 16384
- election-timeout-ms: 1000
- reporter-enabled: false
- reporter-initial-delay: 60
- serialization: jackson
- compressor: none
- sync: true # sync log&snapshot to disk
service-port: 8091 #If not configured, the default is '${server.port} +
1000'
max-commit-retry-timeout: -1
max-rollback-retry-timeout: -1
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
