You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/01/04 15:04:40 UTC
[iotdb] branch cluster_crash updated: Revert "[To rel/0.12] Add a judgement to determine raft log size can fit into buffer before log appending (#4670)"
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch cluster_crash
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/cluster_crash by this push:
new 841df4b Revert "[To rel/0.12] Add a judgement to determine raft log size can fit into buffer before log appending (#4670)"
841df4b is described below
commit 841df4be60d0fbfc7d6d355f0f2d69c30df79897
Author: LebronAl <TX...@gmail.com>
AuthorDate: Tue Jan 4 23:03:03 2022 +0800
Revert "[To rel/0.12] Add a judgement to determine raft log size can fit into buffer before log appending (#4670)"
This reverts commit 420fa10e7991a5e4377aaa5bdc1643f0a88b7ab1.
---
.../iotdb/cluster/server/member/RaftMember.java | 35 +++++-----------------
1 file changed, 7 insertions(+), 28 deletions(-)
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 36794bd..99aeb15 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
@@ -970,22 +970,12 @@ public abstract class RaftMember {
}
long startTime = Timer.Statistic.RAFT_SENDER_APPEND_LOG.getOperationStartTime();
PhysicalPlanLog log = new PhysicalPlanLog();
- log.setPlan(plan);
- // if a single log exceeds the threshold
- // we need to return error code to the client as in server mode
- if (ClusterDescriptor.getInstance().getConfig().isEnableRaftLogPersistence()
- & log.serialize().capacity() + Integer.BYTES
- >= ClusterDescriptor.getInstance().getConfig().getRaftLogBufferSize()) {
- logger.error(
- "Log cannot fit into buffer, please increase raft_log_buffer_size;"
- + "or reduce the size of requests you send.");
- return StatusUtils.INTERNAL_ERROR;
- }
// assign term and index to the new log and append it
synchronized (logManager) {
log.setCurrLogTerm(getTerm().get());
log.setCurrLogIndex(logManager.getLastLogIndex() + 1);
+ log.setPlan(plan);
plan.setIndex(log.getCurrLogIndex());
// appendLogInGroup will serialize log, and set log size, and we will use the size after it
logManager.append(log);
@@ -1011,17 +1001,6 @@ public abstract class RaftMember {
// assign term and index to the new log and append it
SendLogRequest sendLogRequest;
- log.setPlan(plan);
- // just like processPlanLocally,we need to check the size of log
- if (ClusterDescriptor.getInstance().getConfig().isEnableRaftLogPersistence()
- & log.serialize().capacity() + Integer.BYTES
- >= ClusterDescriptor.getInstance().getConfig().getRaftLogBufferSize()) {
- logger.error(
- "Log cannot fit into buffer, please increase raft_log_buffer_size;"
- + "or reduce the size of requests you send.");
- return StatusUtils.INTERNAL_ERROR;
- }
-
long startTime =
Statistic.RAFT_SENDER_COMPETE_LOG_MANAGER_BEFORE_APPEND_V2.getOperationStartTime();
synchronized (logManager) {
@@ -1030,7 +1009,7 @@ public abstract class RaftMember {
log.setCurrLogTerm(getTerm().get());
log.setCurrLogIndex(logManager.getLastLogIndex() + 1);
-
+ log.setPlan(plan);
plan.setIndex(log.getCurrLogIndex());
startTime = Timer.Statistic.RAFT_SENDER_APPEND_LOG_V2.getOperationStartTime();
@@ -1041,12 +1020,12 @@ public abstract class RaftMember {
startTime = Statistic.RAFT_SENDER_BUILD_LOG_REQUEST.getOperationStartTime();
sendLogRequest = buildSendLogRequest(log);
Statistic.RAFT_SENDER_BUILD_LOG_REQUEST.calOperationCostTimeFromStart(startTime);
- }
- startTime = Statistic.RAFT_SENDER_OFFER_LOG.getOperationStartTime();
- log.setCreateTime(System.nanoTime());
- getLogDispatcher().offer(sendLogRequest);
- Statistic.RAFT_SENDER_OFFER_LOG.calOperationCostTimeFromStart(startTime);
+ startTime = Statistic.RAFT_SENDER_OFFER_LOG.getOperationStartTime();
+ log.setCreateTime(System.nanoTime());
+ getLogDispatcher().offer(sendLogRequest);
+ Statistic.RAFT_SENDER_OFFER_LOG.calOperationCostTimeFromStart(startTime);
+ }
try {
AppendLogResult appendLogResult =