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/incubator-ratis.git
The following commit(s) were added to refs/heads/master by this push:
new d4d1c96 RATIS-1024.Unit Tests for MemoryRaftLog entry truncation
(#169). Contributed by Rui Wang
d4d1c96 is described below
commit d4d1c96768955cd6addf5c1fdea1302226b22227
Author: Rui Wang <[email protected]>
AuthorDate: Mon Aug 10 10:04:34 2020 -0700
RATIS-1024.Unit Tests for MemoryRaftLog entry truncation (#169).
Contributed by Rui Wang
---
.../ratis/server/raftlog/RaftLogSequentialOps.java | 2 +-
.../ratis/server/raftlog/memory/MemoryRaftLog.java | 1 -
.../server/raftlog/memory/MemoryRaftLogTest.java | 96 ++++++++++++++++++++++
3 files changed, 97 insertions(+), 2 deletions(-)
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java
index 5e39596..4b790ea 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/RaftLogSequentialOps.java
@@ -53,7 +53,7 @@ interface RaftLogSequentialOps {
/**
* Run the given operation sequentially.
* This method can be invoked by different threads but only one thread at
any given time is allowed.
- * The same thread can call this methed multiple times.
+ * The same thread can call this method multiple times.
*
* @throws IllegalStateException if this runner is already running another
operation.
*/
diff --git
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLog.java
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLog.java
index 0d50341..1d8e3b5 100644
---
a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLog.java
+++
b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLog.java
@@ -171,7 +171,6 @@ public class MemoryRaftLog extends RaftLog {
// truncation in the next appendEntries RPC, leader may think entry 7 has
// been committed but in the system the entry has not been committed to
// the quorum of peers' disks.
- // TODO add a unit test for this
boolean toTruncate = false;
int truncateIndex = (int) logEntryProtos[0].getIndex();
int index = 0;
diff --git
a/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
new file mode 100644
index 0000000..75c4d95
--- /dev/null
+++
b/ratis-test/src/test/java/org/apache/ratis/server/raftlog/memory/MemoryRaftLogTest.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ratis.server.raftlog.memory;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.concurrent.CompletableFuture;
+import org.apache.log4j.Level;
+import org.apache.ratis.BaseTest;
+import org.apache.ratis.MiniRaftCluster;
+import org.apache.ratis.conf.RaftProperties;
+import org.apache.ratis.proto.RaftProtos.LogEntryProto;
+import org.apache.ratis.protocol.RaftGroupId;
+import org.apache.ratis.protocol.RaftGroupMemberId;
+import org.apache.ratis.protocol.RaftPeerId;
+import org.apache.ratis.server.protocol.TermIndex;
+import org.apache.ratis.server.raftlog.RaftLog;
+import org.apache.ratis.statemachine.SimpleStateMachine4Testing;
+import org.apache.ratis.statemachine.StateMachine;
+import org.apache.ratis.util.Log4jUtils;
+import org.junit.Test;
+
+public class MemoryRaftLogTest extends BaseTest {
+ static {
+ Log4jUtils.setLogLevel(MemoryRaftLog.LOG, Level.DEBUG);
+ }
+
+ @Test
+ public void testEntryDoNotPerformTruncation() throws Exception {
+ final RaftProperties prop = new RaftProperties();
+ prop.setClass(MiniRaftCluster.STATEMACHINE_CLASS_KEY,
+ SimpleStateMachine4Testing.class, StateMachine.class);
+ final RaftPeerId peerId = RaftPeerId.valueOf("s0");
+ final RaftGroupId groupId = RaftGroupId.randomId();
+ final RaftGroupMemberId memberId = RaftGroupMemberId.valueOf(peerId,
groupId);
+
+ MemoryRaftLog raftLog = new MemoryRaftLog(memberId, -1, prop);
+ raftLog.open(RaftLog.INVALID_LOG_INDEX, null);
+ LogEntryProto[] entries1 = new LogEntryProto[2];
+ entries1[0] = LogEntryProto.newBuilder().setIndex(0).setTerm(0).build();
+ entries1[1] = LogEntryProto.newBuilder().setIndex(1).setTerm(0).build();
+ raftLog.append(entries1).forEach(CompletableFuture::join);
+
+ LogEntryProto[] entries2 = new LogEntryProto[1];
+ entries2[0] = LogEntryProto.newBuilder().setIndex(0).setTerm(0).build();
+ raftLog.append(entries2).forEach(CompletableFuture::join);
+
+ TermIndex[] termIndices = raftLog.getEntries(0, 10);
+ assertEquals(2, termIndices.length);
+ for (int i = 0; i < 2; i++) {
+ assertEquals(entries1[i].getIndex(), termIndices[i].getIndex());
+ assertEquals(entries1[i].getTerm(), termIndices[i].getTerm());
+ }
+ }
+
+ @Test
+ public void testEntryPerformTruncation() throws Exception {
+ final RaftProperties prop = new RaftProperties();
+ prop.setClass(MiniRaftCluster.STATEMACHINE_CLASS_KEY,
+ SimpleStateMachine4Testing.class, StateMachine.class);
+ final RaftPeerId peerId = RaftPeerId.valueOf("s0");
+ final RaftGroupId groupId = RaftGroupId.randomId();
+ final RaftGroupMemberId memberId = RaftGroupMemberId.valueOf(peerId,
groupId);
+
+ MemoryRaftLog raftLog = new MemoryRaftLog(memberId, -1, prop);
+ raftLog.open(RaftLog.INVALID_LOG_INDEX, null);
+ LogEntryProto[] entries1 = new LogEntryProto[2];
+ entries1[0] = LogEntryProto.newBuilder().setIndex(0).setTerm(0).build();
+ entries1[1] = LogEntryProto.newBuilder().setIndex(1).setTerm(0).build();
+ raftLog.append(entries1).forEach(CompletableFuture::join);
+
+ LogEntryProto[] entries2 = new LogEntryProto[1];
+ entries2[0] = LogEntryProto.newBuilder().setIndex(0).setTerm(2).build();
+ raftLog.append(entries2).forEach(CompletableFuture::join);
+
+ TermIndex[] termIndices = raftLog.getEntries(0, 10);
+ assertEquals(1, termIndices.length);
+ assertEquals(entries2[0].getIndex(), termIndices[0].getIndex());
+ assertEquals(entries2[0].getTerm(), termIndices[0].getTerm());
+ }
+}
