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 ea9c54f8ca bugfix: raft-discovery cannot read registry configuration
for seata-all sdk (#6256)
ea9c54f8ca is described below
commit ea9c54f8cae092ade7aaffc0d77a566e04222267
Author: PeppaO <[email protected]>
AuthorDate: Fri Jan 12 14:13:13 2024 +0800
bugfix: raft-discovery cannot read registry configuration for seata-all
sdk (#6256)
---
changes/en-us/2.x.md | 1 +
changes/zh-cn/2.x.md | 2 +-
.../java/io/seata/discovery/registry/raft/RaftRegistryServiceImpl.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md
index df52104bf8..320ea24f1c 100644
--- a/changes/en-us/2.x.md
+++ b/changes/en-us/2.x.md
@@ -18,6 +18,7 @@ Add changes here for all PR submitted to the 2.x branch.
- [[#6143](https://github.com/apache/incubator-seata/pull/6143)] gracefully
shut down the server
- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] fix the
problem that The incorrect configuration needs to be fixed
- [[#6248](https://github.com/apache/incubator-seata/pull/6248)] fix JDBC
resultSet, statement, connection closing order
+- [[#6248](https://github.com/apache/incubator-seata/pull/6256)] fix
raft-discovery cannot read registry configuration for seata-all sdk
### optimize:
diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md
index 047473b569..838a5a4061 100644
--- a/changes/zh-cn/2.x.md
+++ b/changes/zh-cn/2.x.md
@@ -18,7 +18,7 @@
- [[#6143](https://github.com/apache/incubator-seata/pull/6143)] 修复优雅停机
- [[#6204](https://github.com/apache/incubator-seata/pull/6204)] 修复错误配置问题
- [[#6248](https://github.com/apache/incubator-seata/pull/6248)] 修复JDBC
resultSet, statement, connection关闭顺序
-
+- [[#6248](https://github.com/apache/incubator-seata/pull/6256)] 修复在seata-all
sdk下，raft-discovery模块不能读取registry.conf的配置的问题
### optimize:
- [[#6031](https://github.com/apache/incubator-seata/pull/6031)]
添加undo_log表的存在性校验
diff --git
a/discovery/seata-discovery-raft/src/main/java/io/seata/discovery/registry/raft/RaftRegistryServiceImpl.java
b/discovery/seata-discovery-raft/src/main/java/io/seata/discovery/registry/raft/RaftRegistryServiceImpl.java
index 1461fe73ba..2c62e92ab8 100644
---
a/discovery/seata-discovery-raft/src/main/java/io/seata/discovery/registry/raft/RaftRegistryServiceImpl.java
+++
b/discovery/seata-discovery-raft/src/main/java/io/seata/discovery/registry/raft/RaftRegistryServiceImpl.java
@@ -91,7 +91,7 @@ public class RaftRegistryServiceImpl implements
RegistryService<ConfigChangeList
private static volatile RaftRegistryServiceImpl instance;
- private static final Configuration CONFIG =
ConfigurationFactory.getInstance();
+ private static final Configuration CONFIG =
ConfigurationFactory.CURRENT_FILE_INSTANCE;
private static final String IP_PORT_SPLIT_CHAR = ":";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
