From 285715a0bf5405644ccbc687731bc5d15bd19c62 Mon Sep 17 00:00:00 2001 From: zxuanhong Date: Wed, 10 Apr 2024 09:41:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8F=82=E4=B8=8E=E6=8A=95=E7=A5=A8=E5=BC=82=E5=B8=B8=E7=9B=91?= =?UTF-8?q?=E5=90=AC=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加节点异常监听器，以便为用户提供自动加入集群的时机； --- .../main/java/com/alipay/sofa/jraft/Node.java | 57 +++++++++++++++++++ .../com/alipay/sofa/jraft/core/NodeImpl.java | 39 +++++++++++-- 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/Node.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/Node.java index fe89d9cd8..abbf3e22e 100644 --- a/jraft-core/src/main/java/com/alipay/sofa/jraft/Node.java +++ b/jraft-core/src/main/java/com/alipay/sofa/jraft/Node.java @@ -344,6 +344,32 @@ public interface Node extends Lifecycle, Describer { */ List getReplicatorStatueListeners(); + /** + * SOFAJRaft users can implement the NodeStateListener interface by themselves. + * So users can do their own logical operator in this listener when node error, destroyed or had some errors. + * + * @param nodeStateListener added NodeStateListener which is implemented by users. + */ + void addNodeStateListener(final Node.NodeStateListener nodeStateListener); + + /** + * End User can remove their implement the NodeStateListener interface by themselves. + * + * @param nodeStateListener need to remove the NodeStateListener which has been added by users. + */ + void removeNodeStateListener(final Node.NodeStateListener nodeStateListener); + + /** + * Remove all the NodeStateListener which have been added by users. + */ + void clearNodeStateListener(); + + /** + * Get the NodeStateListener which have been added by users. + * @return node's nodeStateListener which have been added by users. + */ + List getNodeStateListeners(); + /** * Get the node's target election priority value. * @@ -380,4 +406,35 @@ public interface Node extends Lifecycle, Describer { * @since 1.3.12 */ long getLastAppliedLogIndex(); + + /** + * User can implement the NodeStateListener interface by themselves. + * So they can do some their own logic codes when node error, destroyed or had some errors. + * + * @author zxuanhong + * + * 2024-04-10 09:23 + */ + interface NodeStateListener { + + /** + * Called when this can't do preVote as it is not in conf + * + * @param nodeId current node id + * @param options current node options + */ + default void peerNotInConf(NodeId nodeId, NodeOptions options) { + + } + + /** + * Called when this PreVoteResponse no voting granted. + * + * @param nodeId current node id + * @param options current node options + */ + default void noVotingGranted(NodeId nodeId, NodeOptions options) { + + } + } } diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java index ae1c0df4a..96f0c22d4 100644 --- a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java +++ b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/NodeImpl.java @@ -34,6 +34,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.stream.Collectors; +import com.alipay.sofa.jraft.rpc.*; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,9 +82,6 @@ import com.alipay.sofa.jraft.option.ReadOnlyServiceOptions; import com.alipay.sofa.jraft.option.ReplicatorGroupOptions; import com.alipay.sofa.jraft.option.SnapshotExecutorOptions; -import com.alipay.sofa.jraft.rpc.RaftClientService; -import com.alipay.sofa.jraft.rpc.RaftServerService; -import com.alipay.sofa.jraft.rpc.RpcRequestClosure; import com.alipay.sofa.jraft.rpc.RpcRequests.AppendEntriesRequest; import com.alipay.sofa.jraft.rpc.RpcRequests.AppendEntriesResponse; import com.alipay.sofa.jraft.rpc.RpcRequests.InstallSnapshotRequest; @@ -94,8 +92,6 @@ import com.alipay.sofa.jraft.rpc.RpcRequests.RequestVoteResponse; import com.alipay.sofa.jraft.rpc.RpcRequests.TimeoutNowRequest; import com.alipay.sofa.jraft.rpc.RpcRequests.TimeoutNowResponse; -import com.alipay.sofa.jraft.rpc.RpcResponseClosure; -import com.alipay.sofa.jraft.rpc.RpcResponseClosureAdapter; import com.alipay.sofa.jraft.rpc.impl.core.DefaultRaftClientService; import com.alipay.sofa.jraft.storage.LogManager; import com.alipay.sofa.jraft.storage.LogStorage; @@ -220,6 +216,10 @@ public class NodeImpl implements Node, RaftServerService { /** ReplicatorStateListeners */ private final CopyOnWriteArrayList replicatorStateListeners = new CopyOnWriteArrayList<>(); + + /** nodeStateListeners */ + private final CopyOnWriteArrayList nodeStateListeners = new CopyOnWriteArrayList<>(); + /** Node's target leader election priority value */ private volatile int targetPriority; /** The number of elections time out for current node */ @@ -2628,6 +2628,10 @@ public void handlePreVoteResponse(final PeerId peerId, final long term, final Re doUnlock = false; electSelf(); } + }else{ + for(Node.NodeStateListener listener : this.nodeStateListeners) { + RpcUtils.runInThread(() -> listener.noVotingGranted(getNodeId(), options)); + } } } finally { if (doUnlock) { @@ -2674,6 +2678,9 @@ private void preVote() { } if (!this.conf.contains(this.serverId)) { LOG.warn("Node {} can't do preVote as it is not in conf <{}>.", getNodeId(), this.conf); + for(Node.NodeStateListener listener : this.nodeStateListeners) { + RpcUtils.runInThread(() -> listener.peerNotInConf(getNodeId(), options)); + } return; } oldTerm = this.currTerm; @@ -3448,6 +3455,28 @@ public List getReplicatorStatueListeners() { return this.replicatorStateListeners; } + @Override + public void addNodeStateListener(NodeStateListener nodeStateListener) { + Requires.requireNonNull(nodeStateListener, "nodeStateListener"); + this.nodeStateListeners.add(nodeStateListener); + } + + @Override + public void removeNodeStateListener(NodeStateListener nodeStateListener) { + Requires.requireNonNull(nodeStateListener, "nodeStateListener"); + this.nodeStateListeners.remove(nodeStateListener); + } + + @Override + public void clearNodeStateListener() { + this.nodeStateListeners.clear(); + } + + @Override + public List getNodeStateListeners() { + return this.nodeStateListeners; + } + @Override public int getNodeTargetPriority() { return this.targetPriority;