X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FAbstractRaftActorIntegrationTest.java;h=b30412fc40810d5fc04e833ce4a21423c1533a29;hp=13445b0b26bb54f2794446647ab494ffb794fd26;hb=b8c6400766f7324dd57d059bd48e435569fe1a27;hpb=a681e6bec3bbd7b536302ee9e083ae04b7f5ebdd diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java index 13445b0b26..b30412fc40 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java @@ -7,18 +7,19 @@ */ package org.opendaylight.controller.cluster.raft; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import akka.actor.ActorRef; +import akka.actor.InvalidActorNameException; import akka.actor.PoisonPill; -import akka.actor.Props; import akka.actor.Terminated; import akka.dispatch.Dispatchers; import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; -import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableMap; +import com.google.common.util.concurrent.Uninterruptibles; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; @@ -26,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import org.junit.After; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; -import org.opendaylight.controller.cluster.raft.RaftActorTest.MockRaftActor; import org.opendaylight.controller.cluster.raft.base.messages.ApplyJournalEntries; import org.opendaylight.controller.cluster.raft.base.messages.ApplyState; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; @@ -47,24 +47,32 @@ import scala.concurrent.duration.FiniteDuration; */ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest { + public static class SetPeerAddress { + private final String peerId; + private final String peerAddress; + + public SetPeerAddress(String peerId, String peerAddress) { + this.peerId = peerId; + this.peerAddress = peerAddress; + } + + public String getPeerId() { + return peerId; + } + + public String getPeerAddress() { + return peerAddress; + } + } + public static class TestRaftActor extends MockRaftActor { private final TestActorRef collectorActor; private final Map, Boolean> dropMessages = new ConcurrentHashMap<>(); - private volatile byte[] snapshot; - private volatile long mockTotalMemory; - - private TestRaftActor(String id, Map peerAddresses, ConfigParams config, - TestActorRef collectorActor) { - super(id, peerAddresses, Optional.of(config), null); - dataPersistenceProvider = new PersistentDataProvider(); - this.collectorActor = collectorActor; - } - public static Props props(String id, Map peerAddresses, ConfigParams config, - TestActorRef collectorActor) { - return Props.create(TestRaftActor.class, id, peerAddresses, config, collectorActor). - withDispatcher(Dispatchers.DefaultDispatcherId()); + private TestRaftActor(Builder builder) { + super(builder); + this.collectorActor = builder.collectorActor; } void startDropMessages(Class msgClass) { @@ -75,13 +83,8 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest dropMessages.remove(msgClass); } - void setMockTotalMemory(long mockTotalMemory) { - this.mockTotalMemory = mockTotalMemory; - } - - @Override - protected long getTotalMemory() { - return mockTotalMemory > 0 ? mockTotalMemory : super.getTotalMemory(); + void setMockTotalMemory(final long mockTotalMemory) { + getRaftActorContext().setTotalMemoryRetriever(mockTotalMemory > 0 ? () -> mockTotalMemory : null); } @Override @@ -92,6 +95,12 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest return; } + if(message instanceof SetPeerAddress) { + setPeerAddress(((SetPeerAddress) message).getPeerId().toString(), + ((SetPeerAddress) message).getPeerAddress()); + return; + } + try { if(!dropMessages.containsKey(message.getClass())) { super.handleCommand(message); @@ -108,25 +117,38 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest } @Override - protected void createSnapshot() { - if(snapshot != null) { - getSelf().tell(new CaptureSnapshotReply(snapshot), ActorRef.noSender()); + public void createSnapshot(ActorRef actorRef) { + try { + actorRef.tell(new CaptureSnapshotReply(RaftActorTest.fromObject(getState()).toByteArray()), actorRef); + } catch (Exception e) { + e.printStackTrace(); } } - @Override - protected void applyRecoverySnapshot(byte[] bytes) { + public ActorRef collectorActor() { + return collectorActor; } - void setSnapshot(byte[] snapshot) { - this.snapshot = snapshot; + public static Builder newBuilder() { + return new Builder(); } - public ActorRef collectorActor() { - return collectorActor; + public static class Builder extends AbstractBuilder { + private TestActorRef collectorActor; + + public Builder collectorActor(TestActorRef collectorActor) { + this.collectorActor = collectorActor; + return this; + } + + private Builder() { + super(TestRaftActor.class); + } } } + protected static final int SNAPSHOT_CHUNK_SIZE = 100; + protected final Logger testLog = LoggerFactory.getLogger(getClass()); protected final TestActorFactory factory = new TestActorFactory(getSystem()); @@ -155,6 +177,10 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest protected long initialTerm = 5; protected long currentTerm; + protected int snapshotBatchCount = 4; + + protected List expSnapshotState = new ArrayList<>(); + @After public void tearDown() { InMemoryJournal.clear(); @@ -166,9 +192,10 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl(); configParams.setHeartBeatInterval(new FiniteDuration(100, TimeUnit.MILLISECONDS)); configParams.setElectionTimeoutFactor(1); - configParams.setSnapshotBatchCount(4); + configParams.setSnapshotBatchCount(snapshotBatchCount); configParams.setSnapshotDataThresholdPercentage(70); configParams.setIsolatedLeaderCheckInterval(new FiniteDuration(1, TimeUnit.DAYS)); + configParams.setSnapshotChunkSize(SNAPSHOT_CHUNK_SIZE); return configParams; } @@ -180,17 +207,32 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest } protected void waitUntilLeader(ActorRef actorRef) { - RaftActorTest.RaftActorTestKit.waitUntilLeader(actorRef); + RaftActorTestKit.waitUntilLeader(actorRef); } protected TestActorRef newTestRaftActor(String id, Map peerAddresses, ConfigParams configParams) { - TestActorRef collectorActor = factory.createTestActor( + return newTestRaftActor(id, TestRaftActor.newBuilder().peerAddresses(peerAddresses != null ? peerAddresses : + Collections.emptyMap()).config(configParams)); + } + + protected TestActorRef newTestRaftActor(String id, TestRaftActor.Builder builder) { + builder.collectorActor(factory.createTestActor( MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()), - factory.generateActorId(id + "-collector")); - return factory.createTestActor(TestRaftActor.props(id, - peerAddresses != null ? peerAddresses : Collections.emptyMap(), - configParams, collectorActor), id); + factory.generateActorId(id + "-collector"))).id(id); + + InvalidActorNameException lastEx = null; + for(int i = 0; i < 10; i++) { + try { + return factory.createTestActor(builder.props().withDispatcher(Dispatchers.DefaultDispatcherId()), id); + } catch (InvalidActorNameException e) { + lastEx = e; + Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); + } + } + + assertNotNull(lastEx); + throw lastEx; } protected void killActor(TestActorRef leaderActor) { @@ -212,13 +254,21 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest }); } + @SuppressWarnings("unchecked") protected void verifySnapshot(String prefix, Snapshot snapshot, long lastAppliedTerm, - int lastAppliedIndex, long lastTerm, long lastIndex, byte[] data) { + long lastAppliedIndex, long lastTerm, long lastIndex) + throws Exception { assertEquals(prefix + " Snapshot getLastAppliedTerm", lastAppliedTerm, snapshot.getLastAppliedTerm()); assertEquals(prefix + " Snapshot getLastAppliedIndex", lastAppliedIndex, snapshot.getLastAppliedIndex()); assertEquals(prefix + " Snapshot getLastTerm", lastTerm, snapshot.getLastTerm()); assertEquals(prefix + " Snapshot getLastIndex", lastIndex, snapshot.getLastIndex()); - assertArrayEquals(prefix + " Snapshot getState", data, snapshot.getState()); + + List actualState = (List)MockRaftActor.toObject(snapshot.getState()); + assertEquals(String.format("%s Snapshot getState size. Expected %s: . Actual: %s", prefix, expSnapshotState, + actualState), expSnapshotState.size(), actualState.size()); + for(int i = 0; i < expSnapshotState.size(); i++) { + assertEquals(prefix + " Snapshot state " + i, expSnapshotState.get(i), actualState.get(i)); + } } protected void verifyPersistedJournal(String persistenceId, List expJournal) { @@ -263,6 +313,34 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest } protected String testActorPath(String id){ - return "akka://test/user" + id; + return factory.createTestActorPath(id); + } + + protected void verifyLeadersTrimmedLog(long lastIndex) { + verifyTrimmedLog("Leader", leaderActor, lastIndex, lastIndex - 1); + } + + protected void verifyLeadersTrimmedLog(long lastIndex, long replicatedToAllIndex) { + verifyTrimmedLog("Leader", leaderActor, lastIndex, replicatedToAllIndex); + } + + protected void verifyFollowersTrimmedLog(int num, TestActorRef actorRef, long lastIndex) { + verifyTrimmedLog("Follower " + num, actorRef, lastIndex, lastIndex - 1); + } + + protected void verifyTrimmedLog(String name, TestActorRef actorRef, long lastIndex, + long replicatedToAllIndex) { + TestRaftActor actor = actorRef.underlyingActor(); + RaftActorContext context = actor.getRaftActorContext(); + long snapshotIndex = lastIndex - 1; + assertEquals(name + " snapshot term", snapshotIndex < 0 ? -1 : currentTerm, + context.getReplicatedLog().getSnapshotTerm()); + assertEquals(name + " snapshot index", snapshotIndex, context.getReplicatedLog().getSnapshotIndex()); + assertEquals(name + " journal log size", 1, context.getReplicatedLog().size()); + assertEquals(name + " journal last index", lastIndex, context.getReplicatedLog().lastIndex()); + assertEquals(name + " commit index", lastIndex, context.getCommitIndex()); + assertEquals(name + " last applied", lastIndex, context.getLastApplied()); + assertEquals(name + " replicatedToAllIndex", replicatedToAllIndex, + actor.getCurrentBehavior().getReplicatedToAllIndex()); } }