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 2020/04/10 09:51:12 UTC
[incubator-iotdb] branch cluster_data_snapshot updated: update
commit index when applying data snapshot
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch cluster_data_snapshot
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster_data_snapshot by this push:
new 9302f7e update commit index when applying data snapshot
9302f7e is described below
commit 9302f7ea790561d778d6f4f1330a55aedb612c51
Author: jt2594838 <jt...@163.com>
AuthorDate: Fri Apr 10 17:50:58 2020 +0800
update commit index when applying data snapshot
---
cluster/src/main/java/org/apache/iotdb/cluster/log/LogManager.java | 2 ++
.../java/org/apache/iotdb/cluster/log/manage/MemoryLogManager.java | 5 +++++
.../java/org/apache/iotdb/cluster/server/member/DataGroupMember.java | 1 +
.../test/java/org/apache/iotdb/cluster/common/TestLogManager.java | 3 ++-
.../iotdb/cluster/server/heartbeat/DataHeartbeatThreadTest.java | 2 +-
.../apache/iotdb/cluster/server/heartbeat/HeartbeatThreadTest.java | 2 +-
6 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/LogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/LogManager.java
index 90b20bc..a2374c5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/LogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/LogManager.java
@@ -80,4 +80,6 @@ public interface LogManager {
void setLastLogId(long lastLogId);
void setLastLogTerm(long lastLogTerm);
+
+ void setCommitIndex(long commitIndex);
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MemoryLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MemoryLogManager.java
index 6acd7ef..2dd1261 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MemoryLogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MemoryLogManager.java
@@ -171,4 +171,9 @@ public abstract class MemoryLogManager implements LogManager {
public void setLastLogTerm(long lastLogTerm) {
this.lastLogTerm = lastLogTerm;
}
+
+ @Override
+ public void setCommitIndex(long commitIndex) {
+ this.commitLogIndex = commitIndex;
+ }
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
index a010618..8237dfc 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
@@ -457,6 +457,7 @@ public class DataGroupMember extends RaftMember implements TSDataService.AsyncIf
}
logManager.setLastLogId(snapshot.getLastLogId());
logManager.setLastLogTerm(snapshot.getLastLogTerm());
+ logManager.setCommitIndex(snapshot.getLastLogId());
}
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
index 306038c..5908083 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
@@ -91,7 +91,8 @@ public class TestLogManager implements LogManager {
this.lastLogTerm = lastLogTerm;
}
- public void setCommitLogIndex(long commitLogIndex) {
+ @Override
+ public void setCommitIndex(long commitLogIndex) {
this.commitLogIndex = commitLogIndex;
}
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatThreadTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatThreadTest.java
index a31e05f..a4d8747 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatThreadTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/DataHeartbeatThreadTest.java
@@ -116,7 +116,7 @@ public class DataHeartbeatThreadTest extends HeartbeatThreadTest {
dataLogManager = new TestLogManager();
dataLogManager.setLastLogTerm(11);
dataLogManager.setLastLogId(12);
- dataLogManager.setCommitLogIndex(13);
+ dataLogManager.setCommitIndex(13);
}
@Override
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatThreadTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatThreadTest.java
index fbb6432..4a369a7 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatThreadTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/HeartbeatThreadTest.java
@@ -127,7 +127,7 @@ public class HeartbeatThreadTest {
member.getTerm().set(10);
logManager.setLastLogId(9);
logManager.setLastLogTerm(8);
- logManager.setCommitLogIndex(7);
+ logManager.setCommitIndex(7);
respondToElection = false;
testHeartbeat = false;