This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git
The following commit(s) were added to refs/heads/master by this push:
new d637a93ea RATIS-2286. Generate the necessary unified names for the
submodules under RaftServerImpl (#1251)
d637a93ea is described below
commit d637a93ea12c145aafc6d2a6f1e14517fdecd191
Author: jianghuazhu <[email protected]>
AuthorDate: Sat May 3 06:45:59 2025 +0800
RATIS-2286. Generate the necessary unified names for the submodules under
RaftServerImpl (#1251)
---
.../main/java/org/apache/ratis/server/impl/FollowerState.java | 4 ++--
.../java/org/apache/ratis/server/impl/LeaderElection.java | 3 +--
.../java/org/apache/ratis/server/impl/LeaderStateImpl.java | 7 ++++---
.../org/apache/ratis/server/impl/StateMachineUpdater.java | 3 ++-
.../java/org/apache/ratis/server/util/ServerStringUtils.java | 11 +++++++++++
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/FollowerState.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/FollowerState.java
index 1be160f18..b01abcddc 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/impl/FollowerState.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/impl/FollowerState.java
@@ -19,8 +19,8 @@ package org.apache.ratis.server.impl;
import org.apache.ratis.server.DivisionInfo;
import org.apache.ratis.server.leader.LeaderState;
+import org.apache.ratis.server.util.ServerStringUtils;
import org.apache.ratis.util.Daemon;
-import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.TimeDuration;
import org.apache.ratis.util.Timestamp;
import org.slf4j.Logger;
@@ -68,7 +68,7 @@ class FollowerState extends Daemon {
FollowerState(RaftServerImpl server, Object reason) {
super(newBuilder()
- .setName(server.getMemberId() + "-" +
JavaUtils.getClassSimpleName(FollowerState.class))
+ .setName(ServerStringUtils.generateUnifiedName(server.getMemberId(),
FollowerState.class))
.setThreadGroup(server.getThreadGroup()));
this.server = server;
this.reason = reason;
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
index 39b401dda..439405871 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderElection.java
@@ -29,7 +29,6 @@ import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.server.util.ServerStringUtils;
import
org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.ratis.util.Daemon;
-import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.LifeCycle;
import org.apache.ratis.util.LogUtils;
import org.apache.ratis.util.Preconditions;
@@ -191,7 +190,7 @@ class LeaderElection implements Runnable {
private final ConfAndTerm round0;
LeaderElection(RaftServerImpl server, boolean force) {
- this.name = server.getMemberId() + "-" +
JavaUtils.getClassSimpleName(getClass()) + COUNT.incrementAndGet();
+ this.name = ServerStringUtils.generateUnifiedName(server.getMemberId(),
getClass()) + COUNT.incrementAndGet();
this.lifeCycle = new LifeCycle(this);
this.daemon = Daemon.newBuilder().setName(name).setRunnable(this)
.setThreadGroup(server.getThreadGroup()).build();
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
index 0b1e5709e..dd4b9dc1a 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/impl/LeaderStateImpl.java
@@ -49,6 +49,7 @@ import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.server.raftlog.LogEntryHeader;
import org.apache.ratis.server.raftlog.LogProtoUtils;
import org.apache.ratis.server.raftlog.RaftLog;
+import org.apache.ratis.server.util.ServerStringUtils;
import org.apache.ratis.statemachine.TransactionContext;
import org.apache.ratis.util.CodeInjectionForTesting;
import org.apache.ratis.util.CollectionUtils;
@@ -147,7 +148,7 @@ class LeaderStateImpl implements LeaderState {
}
private class EventQueue {
- private final String name = server.getMemberId() + "-" +
JavaUtils.getClassSimpleName(getClass());
+ private final String name =
ServerStringUtils.generateUnifiedName(server.getMemberId(), getClass());
private final BlockingQueue<StateUpdateEvent> queue = new
ArrayBlockingQueue<>(4096);
void submit(StateUpdateEvent event) {
@@ -361,7 +362,7 @@ class LeaderStateImpl implements LeaderState {
private final LeaderLease lease;
LeaderStateImpl(RaftServerImpl server) {
- this.name = server.getMemberId() + "-" +
JavaUtils.getClassSimpleName(getClass());
+ this.name = ServerStringUtils.generateUnifiedName(server.getMemberId(),
getClass());
this.server = server;
final RaftProperties properties = server.getRaftServer().getProperties();
@@ -1236,7 +1237,7 @@ class LeaderStateImpl implements LeaderState {
}
private class ConfigurationStagingState {
- private final String name = server.getMemberId() + "-" +
JavaUtils.getClassSimpleName(getClass());
+ private final String name =
ServerStringUtils.generateUnifiedName(server.getMemberId(), getClass());
private final Map<RaftPeerId, RaftPeer> newPeers;
private final Map<RaftPeerId, RaftPeer> newListeners;
private final PeerConfiguration newConf;
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
index d0d544266..b7c661235 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/impl/StateMachineUpdater.java
@@ -29,6 +29,7 @@ import org.apache.ratis.server.raftlog.RaftLog;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.server.raftlog.RaftLogIOException;
import org.apache.ratis.server.raftlog.RaftLogIndex;
+import org.apache.ratis.server.util.ServerStringUtils;
import org.apache.ratis.statemachine.SnapshotInfo;
import org.apache.ratis.statemachine.StateMachine;
import org.apache.ratis.statemachine.SnapshotRetentionPolicy;
@@ -95,7 +96,7 @@ class StateMachineUpdater implements Runnable {
StateMachineUpdater(StateMachine stateMachine, RaftServerImpl server,
ServerState serverState, long lastAppliedIndex, RaftProperties
properties, Consumer<Long> appliedIndexConsumer) {
- this.name = serverState.getMemberId() + "-" +
JavaUtils.getClassSimpleName(getClass());
+ this.name =
ServerStringUtils.generateUnifiedName(serverState.getMemberId(), getClass());
this.appliedIndexConsumer = appliedIndexConsumer;
this.infoIndexChange = s -> LOG.info("{}: {}", name, s);
this.debugIndexChange = s -> LOG.debug("{}: {}", name, s);
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/util/ServerStringUtils.java
b/ratis-server/src/main/java/org/apache/ratis/server/util/ServerStringUtils.java
index 6e0fce4d6..6601eddce 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/util/ServerStringUtils.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/util/ServerStringUtils.java
@@ -24,8 +24,10 @@ import
org.apache.ratis.proto.RaftProtos.InstallSnapshotRequestProto;
import org.apache.ratis.proto.RaftProtos.LogEntryProto;
import org.apache.ratis.proto.RaftProtos.RequestVoteReplyProto;
import org.apache.ratis.proto.RaftProtos.StateMachineLogEntryProto;
+import org.apache.ratis.protocol.RaftGroupMemberId;
import org.apache.ratis.server.protocol.TermIndex;
import org.apache.ratis.server.raftlog.LogProtoUtils;
+import org.apache.ratis.util.JavaUtils;
import org.apache.ratis.util.ProtoUtils;
import java.util.List;
@@ -118,4 +120,13 @@ public final class ServerStringUtils {
}
return ProtoUtils.toString(proto.getServerReply()) + "-t" +
proto.getTerm();
}
+
+ /**
+ * Used to generate the necessary unified name in the submodules under
+ * {@link org.apache.ratis.server.impl.RaftServerImpl}, which consists
+ * of {@link org.apache.ratis.server.impl.ServerState#memberId} and the
specific class.
+ */
+ public static String generateUnifiedName(RaftGroupMemberId memberId,
Class<?> clazz) {
+ return memberId + "-" + JavaUtils.getClassSimpleName(clazz);
+ }
}
