ptyin commented on code in PR #6326:
URL: https://github.com/apache/incubator-seata/pull/6326#discussion_r1511195219
##########
server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java:
##########
@@ -231,21 +244,48 @@ public void onStopFollowing(final LeaderChangeContext
ctx) {
public void onStartFollowing(final LeaderChangeContext ctx) {
LOGGER.info("groupId: {}, onStartFollowing: {}.", group, ctx);
this.currentTerm.set(ctx.getTerm());
+ CompletableFuture.runAsync(() ->
syncCurrentNodeInfo(ctx.getLeaderId()));
}
@Override
public void onConfigurationCommitted(Configuration conf) {
LOGGER.info("groupId: {}, onConfigurationCommitted: {}.", group, conf);
- syncMetadata();
RouteTable.getInstance().updateConfiguration(group, conf);
+ if (isLeader()) {
+ lock.lock();
+ try {
+ List<PeerId> newFollowers = conf.getPeers();
+ Set<PeerId> newLearners = conf.getLearners();
+ List<Node> currentFollowers =
raftClusterMetadata.getFollowers();
+ if (CollectionUtils.isNotEmpty(newFollowers)) {
+ raftClusterMetadata.setFollowers(currentFollowers.stream()
+ .filter(node -> contains(node,
newFollowers)).collect(Collectors.toList()));
+ }
+ if (CollectionUtils.isNotEmpty(newLearners)) {
+
raftClusterMetadata.setLearner(raftClusterMetadata.getLearner().stream()
+ .filter(node -> contains(node,
newLearners)).collect(Collectors.toList()));
+ }
Review Comment:
Why not just override followers and learners, e.g.,
`raftClusterMetadata.setFollowers(newFollowers)`
##########
server/src/main/java/org/apache/seata/server/cluster/raft/sync/msg/dto/RaftClusterMetadata.java:
##########
@@ -45,11 +47,13 @@ public RaftClusterMetadata(long term) {
this.term = term;
}
- public Node createNode(String host, int txPort, int controlPort, String
group, Map<String, Object> metadata) {
+ public Node createNode(String host, int txPort,int internalPort, int
controlPort, String group, Map<String, Object> metadata) {
Review Comment:
missing space around
##########
server/src/main/java/org/apache/seata/server/cluster/raft/RaftStateMachine.java:
##########
@@ -287,39 +327,98 @@ public void setRaftLeaderMetadata(RaftClusterMetadata
raftClusterMetadata) {
this.raftClusterMetadata = raftClusterMetadata;
}
- public RaftClusterMetadata createNewRaftClusterMetadata() {
- RaftClusterMetadata metadata = new
RaftClusterMetadata(this.currentTerm.get());
- Node leader = metadata.createNode(XID.getIpAddress(), XID.getPort(),
- Integer.parseInt(((Environment)
ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT))
- .getProperty("server.port", String.valueOf(8088))),
- group, Collections.emptyMap());
- leader.setRole(ClusterRole.LEADER);
- metadata.setLeader(leader);
- Configuration configuration =
RouteTable.getInstance().getConfiguration(this.group);
- List<Node> learners = configuration.getLearners().stream().map(learner
-> {
- int nettyPort = learner.getPort() - SERVICE_OFFSET_SPRING_BOOT;
- Node learnerNode = metadata.createNode(learner.getIp(), nettyPort,
nettyPort - SERVICE_OFFSET_SPRING_BOOT,
- this.group, Collections.emptyMap());
- learnerNode.setRole(ClusterRole.LEARNER);
- return learnerNode;
- }).collect(Collectors.toList());
- metadata.setLearner(learners);
- List<Node> followers = configuration.getPeers().stream().map(follower
-> {
- int nettyPort = follower.getPort() - SERVICE_OFFSET_SPRING_BOOT;
- Node followerNode = metadata.createNode(follower.getIp(),
nettyPort, nettyPort - SERVICE_OFFSET_SPRING_BOOT,
- this.group, Collections.emptyMap());
- followerNode.setRole(ClusterRole.FOLLOWER);
- return followerNode;
- }).collect(Collectors.toList());
- metadata.setFollowers(followers);
- return metadata;
+ public RaftClusterMetadata changeOrInitRaftClusterMetadata() {
+ raftClusterMetadata.setTerm(this.currentTerm.get());
+ Node leaderNode = raftClusterMetadata.getLeader();
+ RaftServer raftServer = RaftServerManager.getRaftServer(group);
+ PeerId cureentPeerId = raftServer.getServerId();
+ // After the re-election, the leader information may be different from
the latest leader, and you need to replace the leader information
+ 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(),
+ Integer.parseInt(
+
((Environment)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT))
+ .getProperty("server.port", String.valueOf(8088))),
+ group, Collections.emptyMap());
+ leader.setRole(ClusterRole.LEADER);
+ raftClusterMetadata.setLeader(leader);
+ }
+ return raftClusterMetadata;
}
public void refreshClusterMetadata(RaftBaseMsg syncMsg) {
+ // Directly receive messages from the leader and update the cluster
metadata
raftClusterMetadata =
((RaftClusterMetadataMsg)syncMsg).getRaftClusterMetadata();
((ApplicationEventPublisher)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_APPLICATION_CONTEXT))
.publishEvent(new ClusterChangeEvent(this, group,
raftClusterMetadata.getTerm(), this.isLeader()));
LOGGER.info("groupId: {}, refresh cluster metadata: {}", group,
raftClusterMetadata);
}
+ private void syncCurrentNodeInfo(PeerId leaderPeerId) {
+ if (init.compareAndSet(false, true)) {
+ try {
+ RaftServer raftServer = RaftServerManager.getRaftServer(group);
+ PeerId cureentPeerId = raftServer.getServerId();
+ Node node = raftClusterMetadata.createNode(XID.getIpAddress(),
XID.getPort(), cureentPeerId.getPort(),
+ Integer.parseInt(
+
((Environment)ObjectHolder.INSTANCE.getObject(OBJECT_KEY_SPRING_CONFIGURABLE_ENVIRONMENT))
+ .getProperty("server.port", String.valueOf(8088))),
Review Comment:
Why 8088 instead of 7091 (i.e., default console port).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@seata.apache.org
For additional commands, e-mail: notifications-h...@seata.apache.org
