diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 60b4bb2e1b8..2f363f0292b 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -13,6 +13,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#7114](https://github.com/apache/incubator-seata/pull/7114)] support raft mode registry to namingserver - [[#7133](https://github.com/apache/incubator-seata/pull/7133)] Implement scheduled handling for end status transaction - [[#7171](https://github.com/apache/incubator-seata/pull/7171)] support EpollEventLoopGroup in client +- [[#7182](https://github.com/apache/incubator-seata/pull/7182)] use the ip of the peerId as the host of the raft node - [[#7181](https://github.com/apache/incubator-seata/pull/7181)] raft implements domain name resolution and selects peerId diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index 2193601286b..29fed04339c 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -13,6 +13,7 @@ - [[#7114](https://github.com/apache/incubator-seata/pull/7114)] 支持raft集群注册至namingserver - [[#7133](https://github.com/apache/incubator-seata/pull/7133)] 实现对残留的end状态事务定时处理 - [[#7171](https://github.com/apache/incubator-seata/pull/7171)] 客户端支持 EpollEventLoopGroup +- [[#7182](https://github.com/apache/incubator-seata/pull/7182)] 采用peerId的ip作为raft节点的host - [[#7181](https://github.com/apache/incubator-seata/pull/7181)] raft实现域名解析并选择peerId diff --git a/server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java b/server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java index 89f85e9b298..10d18e9f315 100644 --- a/server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java +++ b/server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java @@ -370,7 +370,7 @@ public RaftClusterMetadata changeOrInitRaftClusterMetadata() { if (leaderNode == null || (leaderNode.getInternal() != null && !cureentPeerId.equals(new PeerId(leaderNode.getInternal().getHost(), leaderNode.getInternal().getPort())))) { Node leader = - raftClusterMetadata.createNode(XID.getIpAddress(), XID.getPort(), raftServer.getServerId().getPort(), + raftClusterMetadata.createNode(cureentPeerId.getIp(), XID.getPort(), raftServer.getServerId().getPort(), Integer.parseInt( ((Environment)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT)) .getProperty("server.port", String.valueOf(7091))), @@ -413,7 +413,7 @@ private void syncCurrentNodeInfo(PeerId leaderPeerId) { if (leader != null && StringUtils.isNotBlank(leader.getVersion())) { RaftServer raftServer = RaftServerManager.getRaftServer(group); PeerId cureentPeerId = raftServer.getServerId(); - Node node = raftClusterMetadata.createNode(XID.getIpAddress(), XID.getPort(), cureentPeerId.getPort(), + Node node = raftClusterMetadata.createNode(cureentPeerId.getIp(), XID.getPort(), cureentPeerId.getPort(), Integer.parseInt( ((Environment)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT)) .getProperty("server.port", String.valueOf(7091))),