You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2021/12/20 01:57:12 UTC
[iotdb] branch expr updated: sanitize VotingLog
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch expr
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/expr by this push:
new 658b42c sanitize VotingLog
658b42c is described below
commit 658b42c3ef4a6fd06ee28e57f7c017e1fa4708ae
Author: jt <jt...@163.com>
AuthorDate: Mon Dec 20 09:56:30 2021 +0800
sanitize VotingLog
---
cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLog.java | 3 ---
.../src/main/java/org/apache/iotdb/cluster/log/VotingLogList.java | 8 +-------
.../cluster/server/handlers/caller/AppendNodeEntryHandler.java | 8 --------
.../java/org/apache/iotdb/cluster/server/member/RaftMember.java | 3 ---
4 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLog.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLog.java
index d56f3f0..dc2d9b0 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLog.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLog.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.cluster.log;
-import java.nio.ByteBuffer;
import java.util.HashSet;
import java.util.Set;
@@ -27,8 +26,6 @@ public class VotingLog {
protected Log log;
protected Set<Integer> stronglyAcceptedNodeIds;
protected Set<Integer> weaklyAcceptedNodeIds;
- public long acceptedTime;
- public volatile ByteBuffer serializedCache;
public VotingLog(Log log, int groupSize) {
this.log = log;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLogList.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLogList.java
index 80878eb..22810f9 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLogList.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/VotingLogList.java
@@ -40,7 +40,7 @@ public class VotingLogList {
*/
public synchronized void insert(VotingLog log) {
if (log.getLog().getCurrLogTerm() != currTerm) {
- logList.clear();
+ clear();
currTerm = log.getLog().getCurrLogTerm();
}
logList.add(log);
@@ -69,11 +69,6 @@ public class VotingLogList {
if (votingLog.getStronglyAcceptedNodeIds().size() >= quorumSize) {
lastEntryIndexToCommit = i;
}
- if (votingLog.getStronglyAcceptedNodeIds().size()
- + votingLog.getWeaklyAcceptedNodeIds().size()
- >= quorumSize) {
- votingLog.acceptedTime = System.nanoTime();
- }
} else if (votingLog.getLog().getCurrLogIndex() > index) {
break;
}
@@ -87,7 +82,6 @@ public class VotingLogList {
if (lastEntryIndexToCommit != -1) {
for (VotingLog acceptedLog : acceptedLogs) {
synchronized (acceptedLog) {
- acceptedLog.acceptedTime = System.nanoTime();
acceptedLog.notifyAll();
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/AppendNodeEntryHandler.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/AppendNodeEntryHandler.java
index c243bca..5c6be20 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/AppendNodeEntryHandler.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/AppendNodeEntryHandler.java
@@ -89,10 +89,6 @@ public class AppendNodeEntryHandler implements AsyncMethodCallback<AppendEntryRe
if (resp == RESPONSE_STRONG_ACCEPT) {
synchronized (log) {
- if (log.getWeaklyAcceptedNodeIds().size() + log.getStronglyAcceptedNodeIds().size()
- >= quorumSize) {
- log.acceptedTime = System.nanoTime();
- }
log.getStronglyAcceptedNodeIds().add(receiver.nodeIdentifier);
log.notifyAll();
}
@@ -123,10 +119,6 @@ public class AppendNodeEntryHandler implements AsyncMethodCallback<AppendEntryRe
}
} else if (resp == RESPONSE_WEAK_ACCEPT) {
synchronized (log) {
- if (log.getWeaklyAcceptedNodeIds().size() + log.getStronglyAcceptedNodeIds().size()
- >= quorumSize) {
- log.acceptedTime = System.nanoTime();
- }
log.getWeaklyAcceptedNodeIds().add(receiver.nodeIdentifier);
log.notifyAll();
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
index 94bf84a..942379f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
@@ -1700,9 +1700,6 @@ public abstract class RaftMember implements RaftMemberMBean {
alreadyWait);
}
}
- if (log.acceptedTime != 0) {
- Statistic.RAFT_WAIT_AFTER_ACCEPTED.calOperationCostTimeFromStart(log.acceptedTime);
- }
Timer.Statistic.RAFT_SENDER_VOTE_COUNTER.calOperationCostTimeFromStart(startTime);
// a node has a larger term than the local node, so this node is no longer a valid leader