X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardTest.java;h=45cfd29d255af37b91df19553261570079c65081;hp=9c6eb257bfd6cc5d19229f1359e2774c2661d1eb;hb=013a6679470bf692753f2e04ab4398c97fd9f5d0;hpb=b70b396725749d3fd6ca761f02f4b630f6f4f1ce diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java index 9c6eb257bf..45cfd29d25 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTest.java @@ -14,12 +14,12 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Mockito.doReturn; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CURRENT_VERSION; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.Props; @@ -31,14 +31,13 @@ import akka.pattern.Patterns; import akka.persistence.SaveSnapshotSuccess; import akka.testkit.TestActorRef; import akka.util.Timeout; -import com.google.common.base.Function; import com.google.common.base.Stopwatch; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.base.Throwables; import com.google.common.util.concurrent.Uninterruptibles; import java.io.IOException; import java.util.Collections; import java.util.HashSet; +import java.util.Map; import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -75,31 +74,31 @@ import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeCh import org.opendaylight.controller.cluster.datastore.messages.RegisterDataTreeChangeListenerReply; import org.opendaylight.controller.cluster.datastore.messages.ShardLeaderStateChanged; import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext; -import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; import org.opendaylight.controller.cluster.datastore.modification.MergeModification; -import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; -import org.opendaylight.controller.cluster.datastore.persisted.PreBoronShardDataTreeSnapshot; -import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener; import org.opendaylight.controller.cluster.datastore.utils.MockDataTreeChangeListener; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListener; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListenerReply; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.ReplicatedLogImplEntry; -import org.opendaylight.controller.cluster.raft.Snapshot; -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.ApplySnapshot; import org.opendaylight.controller.cluster.raft.base.messages.ElectionTimeout; import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus; +import org.opendaylight.controller.cluster.raft.base.messages.TimeoutNow; import org.opendaylight.controller.cluster.raft.client.messages.FindLeader; import org.opendaylight.controller.cluster.raft.client.messages.FindLeaderReply; import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState; import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.cluster.raft.messages.RequestVote; import org.opendaylight.controller.cluster.raft.messages.ServerRemoved; +import org.opendaylight.controller.cluster.raft.persisted.ApplyJournalEntries; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy; +import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; @@ -111,11 +110,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; @@ -125,36 +123,40 @@ import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; public class ShardTest extends AbstractShardTest { - private static final String DUMMY_DATA = "Dummy data as snapshot sequence number is set to 0 in InMemorySnapshotStore and journal recovery seq number will start from 1"; + private static final String DUMMY_DATA = "Dummy data as snapshot sequence number is set to 0 in " + + "InMemorySnapshotStore and journal recovery seq number will start from 1"; @Test public void testRegisterChangeListener() throws Exception { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testRegisterChangeListener"); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRegisterChangeListener"); - waitUntilLeader(shard); + waitUntilLeader(shard); - shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); + shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - "testRegisterChangeListener-DataChangeListener"); + final MockDataChangeListener listener = new MockDataChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, + TestModel.TEST_PATH), "testRegisterChangeListener-DataChangeListener"); - shard.tell(new RegisterChangeListener(TestModel.TEST_PATH, - dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); + shard.tell(new RegisterChangeListener(TestModel.TEST_PATH, dclActor, + AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - final RegisterChangeListenerReply reply = expectMsgClass(duration("3 seconds"), - RegisterChangeListenerReply.class); - final String replyPath = reply.getListenerRegistrationPath().toString(); - assertTrue("Incorrect reply path: " + replyPath, replyPath.matches( - "akka:\\/\\/test\\/user\\/testRegisterChangeListener\\/\\$.*")); + final RegisterChangeListenerReply reply = expectMsgClass(duration("3 seconds"), + RegisterChangeListenerReply.class); + final String replyPath = reply.getListenerRegistrationPath().toString(); + assertTrue("Incorrect reply path: " + replyPath, + replyPath.matches("akka:\\/\\/test\\/user\\/testRegisterChangeListener\\/\\$.*")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; - writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - listener.waitForChangeEvents(path); - }}; + listener.waitForChangeEvents(path); + } + }; } @SuppressWarnings("serial") @@ -163,254 +165,265 @@ public class ShardTest extends AbstractShardTest { // This test tests the timing window in which a change listener is registered before the // shard becomes the leader. We verify that the listener is registered and notified of the // existing data when the shard becomes the leader. - new ShardTestKit(getSystem()) {{ - // For this test, we want to send the RegisterChangeListener message after the shard - // has recovered from persistence and before it becomes the leader. So we subclass - // Shard to override onReceiveCommand and, when the first ElectionTimeout is received, - // we know that the shard has been initialized to a follower and has started the - // election process. The following 2 CountDownLatches are used to coordinate the - // ElectionTimeout with the sending of the RegisterChangeListener message. - final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); - final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); - final Creator creator = new Creator() { - boolean firstElectionTimeout = true; - - @Override - public Shard create() throws Exception { - // Use a non persistent provider because this test actually invokes persist on the journal - // this will cause all other messages to not be queued properly after that. - // The basic issue is that you cannot use TestActorRef with a persistent actor (at least when - // it does do a persist) - return new Shard(newShardBuilder()) { - @Override - public void handleCommand(final Object message) { - if(message instanceof ElectionTimeout && firstElectionTimeout) { - // Got the first ElectionTimeout. We don't forward it to the - // base Shard yet until we've sent the RegisterChangeListener - // message. So we signal the onFirstElectionTimeout latch to tell - // the main thread to send the RegisterChangeListener message and - // start a thread to wait on the onChangeListenerRegistered latch, - // which the main thread signals after it has sent the message. - // After the onChangeListenerRegistered is triggered, we send the - // original ElectionTimeout message to proceed with the election. - firstElectionTimeout = false; - final ActorRef self = getSelf(); - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly( - onChangeListenerRegistered, 5, TimeUnit.SECONDS); - self.tell(message, self); - } - }.start(); - - onFirstElectionTimeout.countDown(); - } else { - super.handleCommand(message); - } - } - }; - } - }; - - setupInMemorySnapshotStore(); - - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - "testRegisterChangeListenerWhenNotLeaderInitially-DataChangeListener"); - - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), - "testRegisterChangeListenerWhenNotLeaderInitially"); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - - // Wait until the shard receives the first ElectionTimeout message. - assertEquals("Got first ElectionTimeout", true, - onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); + // For this test, we want to send the RegisterChangeListener message after the shard + // has recovered from persistence and before it becomes the leader. So we subclass + // Shard to override onReceiveCommand and, when the first ElectionTimeout is received, + // we know that the shard has been initialized to a follower and has started the + // election process. The following 2 CountDownLatches are used to coordinate the + // ElectionTimeout with the sending of the RegisterChangeListener message. + final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); + final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); + final Creator creator = new Creator() { + boolean firstElectionTimeout = true; - // Now send the RegisterChangeListener and wait for the reply. - shard.tell(new RegisterChangeListener(path, dclActor, - AsyncDataBroker.DataChangeScope.SUBTREE, false), getRef()); + @Override + public Shard create() throws Exception { + // Use a non persistent provider because this test actually invokes persist on the journal + // this will cause all other messages to not be queued properly after that. + // The basic issue is that you cannot use TestActorRef with a persistent actor (at least when + // it does do a persist) + return new Shard(newShardBuilder()) { + @Override + public void handleCommand(final Object message) { + if (message instanceof ElectionTimeout && firstElectionTimeout) { + // Got the first ElectionTimeout. We don't forward it to the + // base Shard yet until we've sent the RegisterChangeListener + // message. So we signal the onFirstElectionTimeout latch to tell + // the main thread to send the RegisterChangeListener message and + // start a thread to wait on the onChangeListenerRegistered latch, + // which the main thread signals after it has sent the message. + // After the onChangeListenerRegistered is triggered, we send the + // original ElectionTimeout message to proceed with the election. + firstElectionTimeout = false; + final ActorRef self = getSelf(); + new Thread() { + @Override + public void run() { + Uninterruptibles.awaitUninterruptibly( + onChangeListenerRegistered, 5, TimeUnit.SECONDS); + self.tell(message, self); + } + }.start(); + + onFirstElectionTimeout.countDown(); + } else { + super.handleCommand(message); + } + } + }; + } + }; - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + setupInMemorySnapshotStore(); - // Sanity check - verify the shard is not the leader yet. - shard.tell(FindLeader.INSTANCE, getRef()); - final FindLeaderReply findLeadeReply = - expectMsgClass(duration("5 seconds"), FindLeaderReply.class); - assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataChangeListener listener = new MockDataChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path), + "testRegisterChangeListenerWhenNotLeaderInitially-DataChangeListener"); - // Signal the onChangeListenerRegistered latch to tell the thread above to proceed - // with the election process. - onChangeListenerRegistered.countDown(); + final TestActorRef shard = actorFactory.createTestActor( + Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRegisterChangeListenerWhenNotLeaderInitially"); - // Wait for the shard to become the leader and notify our listener with the existing - // data in the store. - listener.waitForChangeEvents(path); - }}; + new ShardTestKit(getSystem()) { + { + // Wait until the shard receives the first ElectionTimeout + // message. + assertEquals("Got first ElectionTimeout", true, onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); + + // Now send the RegisterChangeListener and wait for the reply. + shard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.SUBTREE, false), + getRef()); + + final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterChangeListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + + // Sanity check - verify the shard is not the leader yet. + shard.tell(FindLeader.INSTANCE, getRef()); + final FindLeaderReply findLeadeReply = expectMsgClass(duration("5 seconds"), FindLeaderReply.class); + assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); + + // Signal the onChangeListenerRegistered latch to tell the + // thread above to proceed + // with the election process. + onChangeListenerRegistered.countDown(); + + // Wait for the shard to become the leader and notify our + // listener with the existing + // data in the store. + listener.waitForChangeEvents(path); + } + }; } @Test public void testRegisterDataTreeChangeListener() throws Exception { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testRegisterDataTreeChangeListener"); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRegisterDataTreeChangeListener"); - waitUntilLeader(shard); + waitUntilLeader(shard); - shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); + shard.tell(new UpdateSchemaContext(SchemaContextHelper.full()), ActorRef.noSender()); - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - "testRegisterDataTreeChangeListener-DataTreeChangeListener"); + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, + TestModel.TEST_PATH), "testRegisterDataTreeChangeListener-DataTreeChangeListener"); - shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, false), getRef()); + shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, false), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("3 seconds"), - RegisterDataTreeChangeListenerReply.class); - final String replyPath = reply.getListenerRegistrationPath().toString(); - assertTrue("Incorrect reply path: " + replyPath, replyPath.matches( - "akka:\\/\\/test\\/user\\/testRegisterDataTreeChangeListener\\/\\$.*")); + final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("3 seconds"), + RegisterDataTreeChangeListenerReply.class); + final String replyPath = reply.getListenerRegistrationPath().toString(); + assertTrue("Incorrect reply path: " + replyPath, + replyPath.matches("akka:\\/\\/test\\/user\\/testRegisterDataTreeChangeListener\\/\\$.*")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; - writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + writeToStore(shard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - listener.waitForChangeEvents(); - }}; + listener.waitForChangeEvents(); + } + }; } @SuppressWarnings("serial") @Test public void testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); - final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); - final Creator creator = new Creator() { - boolean firstElectionTimeout = true; - - @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - public void handleCommand(final Object message) { - if(message instanceof ElectionTimeout && firstElectionTimeout) { - firstElectionTimeout = false; - final ActorRef self = getSelf(); - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly( - onChangeListenerRegistered, 5, TimeUnit.SECONDS); - self.tell(message, self); - } - }.start(); - - onFirstElectionTimeout.countDown(); - } else { - super.handleCommand(message); - } - } - }; - } - }; + final CountDownLatch onFirstElectionTimeout = new CountDownLatch(1); + final CountDownLatch onChangeListenerRegistered = new CountDownLatch(1); + final Creator creator = new Creator() { + boolean firstElectionTimeout = true; - setupInMemorySnapshotStore(); - - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration-DataChangeListener"); + @Override + public Shard create() throws Exception { + return new Shard(newShardBuilder()) { + @Override + public void handleCommand(final Object message) { + if (message instanceof ElectionTimeout && firstElectionTimeout) { + firstElectionTimeout = false; + final ActorRef self = getSelf(); + new Thread() { + @Override + public void run() { + Uninterruptibles.awaitUninterruptibly( + onChangeListenerRegistered, 5, TimeUnit.SECONDS); + self.tell(message, self); + } + }.start(); + + onFirstElectionTimeout.countDown(); + } else { + super.handleCommand(message); + } + } + }; + } + }; - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), - "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration"); + setupInMemorySnapshotStore(); - final YangInstanceIdentifier path = TestModel.TEST_PATH; + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, path), + "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration-DataChangeListener"); - assertEquals("Got first ElectionTimeout", true, - onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); + final TestActorRef shard = actorFactory.createTestActor( + Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testDataTreeChangeListenerNotifiedWhenNotTheLeaderOnRegistration"); - shard.tell(new RegisterDataTreeChangeListener(path, dclActor, false), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); + new ShardTestKit(getSystem()) { + { + assertEquals("Got first ElectionTimeout", true, onFirstElectionTimeout.await(5, TimeUnit.SECONDS)); - shard.tell(FindLeader.INSTANCE, getRef()); - final FindLeaderReply findLeadeReply = - expectMsgClass(duration("5 seconds"), FindLeaderReply.class); - assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); + shard.tell(new RegisterDataTreeChangeListener(path, dclActor, false), getRef()); + final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterDataTreeChangeListenerReply.class); + assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); + shard.tell(FindLeader.INSTANCE, getRef()); + final FindLeaderReply findLeadeReply = expectMsgClass(duration("5 seconds"), FindLeaderReply.class); + assertFalse("Expected the shard not to be the leader", findLeadeReply.getLeaderActor().isPresent()); - onChangeListenerRegistered.countDown(); + onChangeListenerRegistered.countDown(); - // TODO: investigate why we do not receive data chage events - listener.waitForChangeEvents(); - }}; + // TODO: investigate why we do not receive data chage events + listener.waitForChangeEvents(); + } + }; } @Test - public void testCreateTransaction(){ - new ShardTestKit(getSystem()) {{ - final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransaction"); + public void testCreateTransaction() { + new ShardTestKit(getSystem()) { + { + final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransaction"); - waitUntilLeader(shard); + waitUntilLeader(shard); - shard.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); + shard.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); - shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); - final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), - CreateTransactionReply.class); + final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), + CreateTransactionReply.class); - final String path = reply.getTransactionPath().toString(); - assertTrue("Unexpected transaction path " + path, - path.startsWith("akka://test/user/testCreateTransaction/shard-member-1:ShardTransactionTest@0:")); - }}; + final String path = reply.getTransactionPath().toString(); + assertTrue("Unexpected transaction path " + path, path + .startsWith("akka://test/user/testCreateTransaction/shard-member-1:ShardTransactionTest@0:")); + } + }; } @Test - public void testCreateTransactionOnChain(){ - new ShardTestKit(getSystem()) {{ - final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransactionOnChain"); + public void testCreateTransactionOnChain() { + new ShardTestKit(getSystem()) { + { + final ActorRef shard = actorFactory.createActor(newShardProps(), "testCreateTransactionOnChain"); - waitUntilLeader(shard); + waitUntilLeader(shard); - shard.tell(new CreateTransaction(nextTransactionId(),TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); - final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), - CreateTransactionReply.class); + final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"), + CreateTransactionReply.class); - final String path = reply.getTransactionPath().toString(); - assertTrue("Unexpected transaction path " + path, - path.startsWith("akka://test/user/testCreateTransactionOnChain/shard-member-1:ShardTransactionTest@0:")); - }}; + final String path = reply.getTransactionPath().toString(); + assertTrue("Unexpected transaction path " + path, path.startsWith( + "akka://test/user/testCreateTransactionOnChain/shard-member-1:ShardTransactionTest@0:")); + } + }; } @Test public void testPeerAddressResolved() throws Exception { - new ShardTestKit(getSystem()) {{ - ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), "config"); - final TestActorRef shard = actorFactory.createTestActor(newShardBuilder(). - peerAddresses(Collections.singletonMap(peerID.toString(), null)).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved"); - - final String address = "akka://foobar"; - shard.tell(new PeerAddressResolved(peerID.toString(), address), ActorRef.noSender()); - - shard.tell(GetOnDemandRaftState.INSTANCE, getRef()); - OnDemandRaftState state = expectMsgClass(OnDemandRaftState.class); - assertEquals("getPeerAddress", address, state.getPeerAddresses().get(peerID.toString())); - }}; + new ShardTestKit(getSystem()) { + { + final ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), + "config"); + final TestActorRef shard = actorFactory.createTestActor(newShardBuilder() + .peerAddresses(Collections.singletonMap(peerID.toString(), null)) + .props().withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved"); + + final String address = "akka://foobar"; + shard.tell(new PeerAddressResolved(peerID.toString(), address), ActorRef.noSender()); + + shard.tell(GetOnDemandRaftState.INSTANCE, getRef()); + final OnDemandRaftState state = expectMsgClass(OnDemandRaftState.class); + assertEquals("getPeerAddress", address, state.getPeerAddresses().get(peerID.toString())); + } + }; } @Test public void testApplySnapshot() throws Exception { - final TestActorRef shard = actorFactory.createTestActor(newShardProps(), "testApplySnapshot"); + final TestActorRef shard = actorFactory.createTestActor(newShardProps() + .withDispatcher(Dispatchers.DefaultDispatcherId()), "testApplySnapshot"); ShardTestKit.waitUntilLeader(shard); @@ -418,8 +431,8 @@ public class ShardTest extends AbstractShardTest { store.setSchemaContext(SCHEMA_CONTEXT); final ContainerNode container = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).addChild( + new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).addChild( ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1)).build()).build(); writeToStore(store, TestModel.TEST_PATH, container); @@ -427,14 +440,25 @@ public class ShardTest extends AbstractShardTest { final YangInstanceIdentifier root = YangInstanceIdentifier.EMPTY; final NormalizedNode expected = readStore(store, root); - final Snapshot snapshot = Snapshot.create(new PreBoronShardDataTreeSnapshot(expected).serialize(), - Collections.emptyList(), 1, 2, 3, 4); + final Snapshot snapshot = Snapshot.create( + new ShardSnapshotState(new MetadataShardDataTreeSnapshot(expected)), + Collections.emptyList(), 1, 2, 3, 4, -1, null, null); + + shard.tell(new ApplySnapshot(snapshot), ActorRef.noSender()); - shard.underlyingActor().getRaftActorSnapshotCohort().applySnapshot(snapshot.getState()); + final Stopwatch sw = Stopwatch.createStarted(); + while (sw.elapsed(TimeUnit.SECONDS) <= 5) { + Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS); - final NormalizedNode actual = readStore(shard, root); + try { + assertEquals("Root node", expected, readStore(shard, root)); + return; + } catch (final AssertionError e) { + // try again + } + } - assertEquals("Root node", expected, actual); + fail("Snapshot was not applied"); } @Test @@ -444,24 +468,23 @@ public class ShardTest extends AbstractShardTest { ShardTestKit.waitUntilLeader(shard); - final DataTree source = setupInMemorySnapshotStore(); - final DataTreeModification writeMod = source.takeSnapshot().newModification(); - ContainerNode node = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final DataTree store = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); + store.setSchemaContext(SCHEMA_CONTEXT); + + final DataTreeModification writeMod = store.takeSnapshot().newModification(); + final ContainerNode node = ImmutableNodes.containerNode(TestModel.TEST_QNAME); writeMod.write(TestModel.TEST_PATH, node); writeMod.ready(); final TransactionIdentifier tx = nextTransactionId(); - final ApplyState applyState = new ApplyState(null, tx, - new ReplicatedLogImplEntry(1, 2, payloadForModification(source, writeMod, tx))); - - shard.tell(applyState, shard); + shard.underlyingActor().applyState(null, null, payloadForModification(store, writeMod, tx)); - Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.SECONDS) <= 5) { + final Stopwatch sw = Stopwatch.createStarted(); + while (sw.elapsed(TimeUnit.SECONDS) <= 5) { Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS); final NormalizedNode actual = readStore(shard, TestModel.TEST_PATH); - if(actual != null) { + if (actual != null) { assertEquals("Applied state", node, actual); return; } @@ -481,7 +504,7 @@ public class ShardTest extends AbstractShardTest { InMemoryJournal.addEntry(shardID.toString(), 0, DUMMY_DATA); // Set up the InMemoryJournal. - InMemoryJournal.addEntry(shardID.toString(), 1, new ReplicatedLogImplEntry(0, 1, + InMemoryJournal.addEntry(shardID.toString(), 1, new SimpleReplicatedLogEntry(0, 1, payloadForModification(source, writeMod, nextTransactionId()))); final int nListEntries = 16; @@ -498,7 +521,7 @@ public class ShardTest extends AbstractShardTest { mod.merge(path, ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, i)); mod.ready(); - InMemoryJournal.addEntry(shardID.toString(), i+1, new ReplicatedLogImplEntry(i, 1, + InMemoryJournal.addEntry(shardID.toString(), i + 1, new SimpleReplicatedLogEntry(i, 1, payloadForModification(source, mod, nextTransactionId()))); } @@ -509,1551 +532,1359 @@ public class ShardTest extends AbstractShardTest { } @Test - public void testConcurrentThreePhaseCommits() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testConcurrentThreePhaseCommits"); + @SuppressWarnings("checkstyle:IllegalCatch") + public void testConcurrentThreePhaseCommits() throws Exception { + final AtomicReference caughtEx = new AtomicReference<>(); + final CountDownLatch commitLatch = new CountDownLatch(2); - waitUntilLeader(shard); + final long timeoutSec = 5; + final FiniteDuration duration = FiniteDuration.create(timeoutSec, TimeUnit.SECONDS); + final Timeout timeout = new Timeout(duration); - // Setup 3 simulated transactions with mock cohorts backed by real cohorts. - - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testConcurrentThreePhaseCommits"); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore, - TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), - modification2); + class OnFutureComplete extends OnComplete { + private final Class expRespType; - final TransactionIdentifier transactionID3 = nextTransactionId(); - final MutableCompositeModification modification3 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore, - YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), - modification3); + OnFutureComplete(final Class expRespType) { + this.expRespType = expRespType; + } - final long timeoutSec = 5; - final FiniteDuration duration = FiniteDuration.create(timeoutSec, TimeUnit.SECONDS); - final Timeout timeout = new Timeout(duration); + @Override + public void onComplete(final Throwable error, final Object resp) { + if (error != null) { + caughtEx.set(new AssertionError(getClass().getSimpleName() + " failure", error)); + } else { + try { + assertEquals("Commit response type", expRespType, resp.getClass()); + onSuccess(resp); + } catch (final Exception e) { + caughtEx.set(e); + } + } + } - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - final ReadyTransactionReply readyReply = ReadyTransactionReply.fromSerializable( - expectMsgClass(duration, ReadyTransactionReply.class)); - assertEquals("Cohort path", shard.path().toString(), readyReply.getCohortPath()); + void onSuccess(final Object resp) throws Exception { + } + } - // Send the CanCommitTransaction message for the first Tx. + class OnCommitFutureComplete extends OnFutureComplete { + OnCommitFutureComplete() { + super(CommitTransactionReply.class); + } - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + @Override + public void onComplete(final Throwable error, final Object resp) { + super.onComplete(error, resp); + commitLatch.countDown(); + } + } - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + class OnCanCommitFutureComplete extends OnFutureComplete { + private final TransactionIdentifier transactionID; - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, modification3), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + OnCanCommitFutureComplete(final TransactionIdentifier transactionID) { + super(CanCommitTransactionReply.class); + this.transactionID = transactionID; + } - // Send the CanCommitTransaction message for the next 2 Tx's. These should get queued and - // processed after the first Tx completes. + @Override + void onSuccess(final Object resp) throws Exception { + final CanCommitTransactionReply canCommitReply = + CanCommitTransactionReply.fromSerializable(resp); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - final Future canCommitFuture1 = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + final Future commitFuture = Patterns.ask(shard, + new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), timeout); + commitFuture.onComplete(new OnCommitFutureComplete(), getSystem().dispatcher()); + } + } - final Future canCommitFuture2 = Patterns.ask(shard, - new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), timeout); + new ShardTestKit(getSystem()) { + { + waitUntilLeader(shard); - // Send the CommitTransaction message for the first Tx. After it completes, it should - // trigger the 2nd Tx to proceed which should in turn then trigger the 3rd. + final TransactionIdentifier transactionID1 = nextTransactionId(); + final TransactionIdentifier transactionID2 = nextTransactionId(); + final TransactionIdentifier transactionID3 = nextTransactionId(); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + final Map cohortMap = setupCohortDecorator( + shard.underlyingActor(), transactionID1, transactionID2, transactionID3); + final CapturingShardDataTreeCohort cohort1 = cohortMap.get(transactionID1); + final CapturingShardDataTreeCohort cohort2 = cohortMap.get(transactionID2); + final CapturingShardDataTreeCohort cohort3 = cohortMap.get(transactionID3); - // Wait for the next 2 Tx's to complete. + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + final ReadyTransactionReply readyReply = ReadyTransactionReply + .fromSerializable(expectMsgClass(duration, ReadyTransactionReply.class)); + assertEquals("Cohort path", shard.path().toString(), readyReply.getCohortPath()); - final AtomicReference caughtEx = new AtomicReference<>(); - final CountDownLatch commitLatch = new CountDownLatch(2); + // Send the CanCommitTransaction message for the first Tx. - class OnFutureComplete extends OnComplete { - private final Class expRespType; + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - OnFutureComplete(final Class expRespType) { - this.expRespType = expRespType; - } + // Ready 2 more Tx's. - @Override - public void onComplete(final Throwable error, final Object resp) { - if(error != null) { - caughtEx.set(new AssertionError(getClass().getSimpleName() + " failure", error)); - } else { - try { - assertEquals("Commit response type", expRespType, resp.getClass()); - onSuccess(resp); - } catch (final Exception e) { - caughtEx.set(e); - } - } - } + shard.tell(prepareBatchedModifications(transactionID2, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - void onSuccess(final Object resp) throws Exception { - } - } + shard.tell( + prepareBatchedModifications(transactionID3, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - class OnCommitFutureComplete extends OnFutureComplete { - OnCommitFutureComplete() { - super(CommitTransactionReply.class); - } + // Send the CanCommitTransaction message for the next 2 Tx's. + // These should get queued and + // processed after the first Tx completes. - @Override - public void onComplete(final Throwable error, final Object resp) { - super.onComplete(error, resp); - commitLatch.countDown(); - } - } + final Future canCommitFuture1 = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - class OnCanCommitFutureComplete extends OnFutureComplete { - private final TransactionIdentifier transactionID; + final Future canCommitFuture2 = Patterns.ask(shard, + new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), timeout); - OnCanCommitFutureComplete(final TransactionIdentifier transactionID) { - super(CanCommitTransactionReply.class); - this.transactionID = transactionID; - } + // Send the CommitTransaction message for the first Tx. After it + // completes, it should + // trigger the 2nd Tx to proceed which should in turn then + // trigger the 3rd. - @Override - void onSuccess(final Object resp) throws Exception { - final CanCommitTransactionReply canCommitReply = - CanCommitTransactionReply.fromSerializable(resp); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - final Future commitFuture = Patterns.ask(shard, - new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), timeout); - commitFuture.onComplete(new OnCommitFutureComplete(), getSystem().dispatcher()); - } - } + // Wait for the next 2 Tx's to complete. - canCommitFuture1.onComplete(new OnCanCommitFutureComplete(transactionID2), - getSystem().dispatcher()); + canCommitFuture1.onComplete(new OnCanCommitFutureComplete(transactionID2), getSystem().dispatcher()); - canCommitFuture2.onComplete(new OnCanCommitFutureComplete(transactionID3), - getSystem().dispatcher()); + canCommitFuture2.onComplete(new OnCanCommitFutureComplete(transactionID3), getSystem().dispatcher()); - final boolean done = commitLatch.await(timeoutSec, TimeUnit.SECONDS); + final boolean done = commitLatch.await(timeoutSec, TimeUnit.SECONDS); - if(caughtEx.get() != null) { - throw caughtEx.get(); - } + if (caughtEx.get() != null) { + Throwables.propagateIfInstanceOf(caughtEx.get(), Exception.class); + Throwables.propagate(caughtEx.get()); + } - assertEquals("Commits complete", true, done); + assertEquals("Commits complete", true, done); - final InOrder inOrder = inOrder(cohort1, cohort2, cohort3); - inOrder.verify(cohort1).canCommit(); - inOrder.verify(cohort1).preCommit(); - inOrder.verify(cohort1).commit(); - inOrder.verify(cohort2).canCommit(); - inOrder.verify(cohort2).preCommit(); - inOrder.verify(cohort2).commit(); - inOrder.verify(cohort3).canCommit(); - inOrder.verify(cohort3).preCommit(); - inOrder.verify(cohort3).commit(); +// final InOrder inOrder = inOrder(cohort1.getCanCommit(), cohort1.getPreCommit(), cohort1.getCommit(), +// cohort2.getCanCommit(), cohort2.getPreCommit(), cohort2.getCommit(), cohort3.getCanCommit(), +// cohort3.getPreCommit(), cohort3.getCommit()); +// inOrder.verify(cohort1.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort1.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort2.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort2.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort3.getCanCommit()).onSuccess(any(Void.class)); +// inOrder.verify(cohort3.getPreCommit()).onSuccess(any(DataTreeCandidate.class)); +// inOrder.verify(cohort1.getCommit()).onSuccess(any(UnsignedLong.class)); +// inOrder.verify(cohort2.getCommit()).onSuccess(any(UnsignedLong.class)); +// inOrder.verify(cohort3.getCommit()).onSuccess(any(UnsignedLong.class)); - // Verify data in the data store. + // Verify data in the data store. - verifyOuterListEntry(shard, 1); + verifyOuterListEntry(shard, 1); - verifyLastApplied(shard, 2); - }}; + verifyLastApplied(shard, 2); + } + }; } @Test - public void testBatchedModificationsWithNoCommitOnReady() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithNoCommitOnReady"); - - waitUntilLeader(shard); - - final TransactionIdentifier transactionID = nextTransactionId(); - final FiniteDuration duration = duration("5 seconds"); - - final AtomicReference mockCohort = new AtomicReference<>(); - final ShardCommitCoordinator.CohortDecorator cohortDecorator = (txID, actual) -> { - if(mockCohort.get() == null) { - mockCohort.set(createDelegatingMockCohort("cohort", actual)); - } - - return mockCohort.get(); - }; + public void testBatchedModificationsWithNoCommitOnReady() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithNoCommitOnReady"); - shard.underlyingActor().getCommitCoordinator().setCohortDecorator(cohortDecorator); + waitUntilLeader(shard); - // Send a BatchedModifications to start a transaction. + final TransactionIdentifier transactionID = nextTransactionId(); + final FiniteDuration duration = duration("5 seconds"); - shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a BatchedModifications to start a transaction. - // Send a couple more BatchedModifications. + shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); + expectMsgClass(duration, BatchedModificationsReply.class); - shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a couple more BatchedModifications. - shard.tell(newBatchedModifications(transactionID, YangInstanceIdentifier.builder( - TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, false, 3), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell( + newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), + getRef()); + expectMsgClass(duration, BatchedModificationsReply.class); - // Send the CanCommitTransaction message. + shard.tell(newBatchedModifications(transactionID, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, false, 3), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + // Send the CanCommitTransaction message. - // Send the CanCommitTransaction message. + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + // Send the CommitTransaction message. - final InOrder inOrder = inOrder(mockCohort.get()); - inOrder.verify(mockCohort.get()).canCommit(); - inOrder.verify(mockCohort.get()).preCommit(); - inOrder.verify(mockCohort.get()).commit(); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - // Verify data in the data store. + // Verify data in the data store. - verifyOuterListEntry(shard, 1); - }}; + verifyOuterListEntry(shard, 1); + } + }; } @Test - public void testBatchedModificationsWithCommitOnReady() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithCommitOnReady"); - - waitUntilLeader(shard); - - final TransactionIdentifier transactionID = nextTransactionId(); - final FiniteDuration duration = duration("5 seconds"); - - final AtomicReference mockCohort = new AtomicReference<>(); - final ShardCommitCoordinator.CohortDecorator cohortDecorator = (txID, actual) -> { - if(mockCohort.get() == null) { - mockCohort.set(createDelegatingMockCohort("cohort", actual)); - } - - return mockCohort.get(); - }; + public void testBatchedModificationsWithCommitOnReady() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithCommitOnReady"); - shard.underlyingActor().getCommitCoordinator().setCohortDecorator(cohortDecorator); + waitUntilLeader(shard); - // Send a BatchedModifications to start a transaction. + final TransactionIdentifier transactionID = nextTransactionId(); + final FiniteDuration duration = duration("5 seconds"); - shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a BatchedModifications to start a transaction. - // Send a couple more BatchedModifications. + shard.tell(newBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false, false, 1), getRef()); + expectMsgClass(duration, BatchedModificationsReply.class); - shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), getRef()); - expectMsgClass(duration, BatchedModificationsReply.class); + // Send a couple more BatchedModifications. - shard.tell(newBatchedModifications(transactionID, YangInstanceIdentifier.builder( - TestModel.OUTER_LIST_PATH).nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, true, 3), getRef()); + shard.tell(newBatchedModifications(transactionID, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), false, false, 2), + getRef()); + expectMsgClass(duration, BatchedModificationsReply.class); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(newBatchedModifications(transactionID, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), true, true, 3), + getRef()); - final InOrder inOrder = inOrder(mockCohort.get()); - inOrder.verify(mockCohort.get()).canCommit(); - inOrder.verify(mockCohort.get()).preCommit(); - inOrder.verify(mockCohort.get()).commit(); + expectMsgClass(duration, CommitTransactionReply.class); - // Verify data in the data store. + // Verify data in the data store. - verifyOuterListEntry(shard, 1); - }}; + verifyOuterListEntry(shard, 1); + } + }; } - @Test(expected=IllegalStateException.class) - public void testBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsReadyWithIncorrectTotalMessageCount"); + @Test(expected = IllegalStateException.class) + public void testBatchedModificationsReadyWithIncorrectTotalMessageCount() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsReadyWithIncorrectTotalMessageCount"); - waitUntilLeader(shard); + waitUntilLeader(shard); - final TransactionIdentifier transactionID = nextTransactionId(); - final BatchedModifications batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); - batched.setReady(true); - batched.setTotalMessagesSent(2); + final TransactionIdentifier transactionID = nextTransactionId(); + final BatchedModifications batched = new BatchedModifications(transactionID, + DataStoreVersions.CURRENT_VERSION); + batched.setReady(true); + batched.setTotalMessagesSent(2); - shard.tell(batched, getRef()); + shard.tell(batched, getRef()); - final Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + final Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - if(failure != null) { - throw failure.cause(); + if (failure != null) { + Throwables.propagateIfInstanceOf(failure.cause(), Exception.class); + Throwables.propagate(failure.cause()); + } } - }}; + }; } @Test - public void testBatchedModificationsWithOperationFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsWithOperationFailure"); + public void testBatchedModificationsWithOperationFailure() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsWithOperationFailure"); - waitUntilLeader(shard); + waitUntilLeader(shard); - // Test merge with invalid data. An exception should occur when the merge is applied. Note that - // write will not validate the children for performance reasons. + // Test merge with invalid data. An exception should occur when + // the merge is applied. Note that + // write will not validate the children for performance reasons. - TransactionIdentifier transactionID = nextTransactionId(); + final TransactionIdentifier transactionID = nextTransactionId(); - ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)). - withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build(); + final ContainerNode invalidData = ImmutableContainerNodeBuilder.create() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)) + .withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build(); - BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); - batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData)); - shard.tell(batched, getRef()); - Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); + batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData)); + shard.tell(batched, getRef()); + Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - Throwable cause = failure.cause(); + final Throwable cause = failure.cause(); - batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); - batched.setReady(true); - batched.setTotalMessagesSent(2); + batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION); + batched.setReady(true); + batched.setTotalMessagesSent(2); - shard.tell(batched, getRef()); + shard.tell(batched, getRef()); - failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - assertEquals("Failure cause", cause, failure.cause()); - }}; + failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + assertEquals("Failure cause", cause, failure.cause()); + } + }; } @Test - public void testBatchedModificationsOnTransactionChain() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testBatchedModificationsOnTransactionChain"); + public void testBatchedModificationsOnTransactionChain() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testBatchedModificationsOnTransactionChain"); - waitUntilLeader(shard); + waitUntilLeader(shard); - final LocalHistoryIdentifier historyId = nextHistoryId(); - final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0); - final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1); + final LocalHistoryIdentifier historyId = nextHistoryId(); + final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0); + final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1); - final FiniteDuration duration = duration("5 seconds"); + final FiniteDuration duration = duration("5 seconds"); - // Send a BatchedModifications to start a chained write transaction and ready it. + // Send a BatchedModifications to start a chained write + // transaction and ready it. - final ContainerNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - final YangInstanceIdentifier path = TestModel.TEST_PATH; - shard.tell(newBatchedModifications(transactionID1, path, containerNode, true, false, 1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final ContainerNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + shard.tell(newBatchedModifications(transactionID1, path, containerNode, true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Create a read Tx on the same chain. + // Create a read Tx on the same chain. - shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(), - DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(), + DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef()); - final CreateTransactionReply createReply = expectMsgClass(duration("3 seconds"), CreateTransactionReply.class); + final CreateTransactionReply createReply = expectMsgClass(duration("3 seconds"), + CreateTransactionReply.class); - getSystem().actorSelection(createReply.getTransactionPath()).tell( - new ReadData(path, DataStoreVersions.CURRENT_VERSION), getRef()); - final ReadDataReply readReply = expectMsgClass(duration("3 seconds"), ReadDataReply.class); - assertEquals("Read node", containerNode, readReply.getNormalizedNode()); + getSystem().actorSelection(createReply.getTransactionPath()) + .tell(new ReadData(path, DataStoreVersions.CURRENT_VERSION), getRef()); + final ReadDataReply readReply = expectMsgClass(duration("3 seconds"), ReadDataReply.class); + assertEquals("Read node", containerNode, readReply.getNormalizedNode()); - // Commit the write transaction. + // Commit the write transaction. - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - // Verify data in the data store. + // Verify data in the data store. - final NormalizedNode actualNode = readStore(shard, path); - assertEquals("Stored node", containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, path); + assertEquals("Stored node", containerNode, actualNode); + } + }; } @Test public void testOnBatchedModificationsWhenNotLeader() { final AtomicBoolean overrideLeaderCalls = new AtomicBoolean(); - new ShardTestKit(getSystem()) {{ - final Creator creator = new Creator() { - private static final long serialVersionUID = 1L; - - @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - protected boolean isLeader() { - return overrideLeaderCalls.get() ? false : super.isLeader(); - } + new ShardTestKit(getSystem()) { + { + final Creator creator = new Creator() { + private static final long serialVersionUID = 1L; + + @Override + public Shard create() throws Exception { + return new Shard(newShardBuilder()) { + @Override + protected boolean isLeader() { + return overrideLeaderCalls.get() ? false : super.isLeader(); + } - @Override - protected ActorSelection getLeader() { - return overrideLeaderCalls.get() ? getSystem().actorSelection(getRef().path()) : - super.getLeader(); - } - }; - } - }; + @Override + public ActorSelection getLeader() { + return overrideLeaderCalls.get() ? getSystem().actorSelection(getRef().path()) + : super.getLeader(); + } + }; + } + }; - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)). - withDispatcher(Dispatchers.DefaultDispatcherId()), "testOnBatchedModificationsWhenNotLeader"); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testOnBatchedModificationsWhenNotLeader"); - waitUntilLeader(shard); + waitUntilLeader(shard); - overrideLeaderCalls.set(true); + overrideLeaderCalls.set(true); - final BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION); + final BatchedModifications batched = new BatchedModifications(nextTransactionId(), + DataStoreVersions.CURRENT_VERSION); - shard.tell(batched, ActorRef.noSender()); + shard.tell(batched, ActorRef.noSender()); - expectMsgEquals(batched); - }}; + expectMsgEquals(batched); + } + }; } @Test public void testTransactionMessagesWithNoLeader() { - new ShardTestKit(getSystem()) {{ - dataStoreContextBuilder.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()). - shardHeartbeatIntervalInMillis(50).shardElectionTimeoutFactor(1); - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionMessagesWithNoLeader"); - - waitUntilNoLeader(shard); - - final TransactionIdentifier txId = nextTransactionId(); - shard.tell(new BatchedModifications(txId, DataStoreVersions.CURRENT_VERSION), getRef()); - Failure failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - - shard.tell(prepareForwardedReadyTransaction(mock(ShardDataTreeCohort.class), txId, - DataStoreVersions.CURRENT_VERSION, true), getRef()); - failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - - shard.tell(new ReadyLocalTransaction(txId, mock(DataTreeModification.class), true), getRef()); - failure = expectMsgClass(Failure.class); - assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); - }}; + new ShardTestKit(getSystem()) { + { + dataStoreContextBuilder.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()) + .shardHeartbeatIntervalInMillis(50).shardElectionTimeoutFactor(1); + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionMessagesWithNoLeader"); + + waitUntilNoLeader(shard); + + final TransactionIdentifier txId = nextTransactionId(); + shard.tell(new BatchedModifications(txId, DataStoreVersions.CURRENT_VERSION), getRef()); + Failure failure = expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); + + shard.tell(prepareForwardedReadyTransaction(shard, txId, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); + failure = expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); + + shard.tell(new ReadyLocalTransaction(txId, mock(DataTreeModification.class), true), getRef()); + failure = expectMsgClass(Failure.class); + assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass()); + } + }; } @Test - public void testReadyWithReadWriteImmediateCommit() throws Exception{ + public void testReadyWithReadWriteImmediateCommit() throws Exception { testReadyWithImmediateCommit(true); } @Test - public void testReadyWithWriteOnlyImmediateCommit() throws Exception{ + public void testReadyWithWriteOnlyImmediateCommit() throws Exception { testReadyWithImmediateCommit(false); } - private void testReadyWithImmediateCommit(final boolean readWrite) throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyWithImmediateCommit-" + readWrite); - - waitUntilLeader(shard); - - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - final TransactionIdentifier transactionID = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - final ShardDataTreeCohort cohort = setupMockWriteTransaction("cohort", dataStore, - TestModel.TEST_PATH, containerNode, modification); - - final FiniteDuration duration = duration("5 seconds"); + private void testReadyWithImmediateCommit(final boolean readWrite) throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyWithImmediateCommit-" + readWrite); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification, true), getRef()); + waitUntilLeader(shard); - expectMsgClass(duration, CommitTransactionReply.class); + final TransactionIdentifier transactionID = nextTransactionId(); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, + containerNode, true), getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, true), + getRef()); + } - final InOrder inOrder = inOrder(cohort); - inOrder.verify(cohort).canCommit(); - inOrder.verify(cohort).preCommit(); - inOrder.verify(cohort).commit(); + expectMsgClass(duration("5 seconds"), CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); - assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); + } + }; } @Test - public void testReadyLocalTransactionWithImmediateCommit() throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyLocalTransactionWithImmediateCommit"); + public void testReadyLocalTransactionWithImmediateCommit() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyLocalTransactionWithImmediateCommit"); - waitUntilLeader(shard); + waitUntilLeader(shard); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final DataTreeModification modification = dataStore.newModification(); + final DataTreeModification modification = dataStore.newModification(); - final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); - final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); - new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); + final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); + final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); + new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); - final TransactionIdentifier txId = nextTransactionId(); - modification.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, true); + final TransactionIdentifier txId = nextTransactionId(); + modification.ready(); + final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, true); - shard.tell(readyMessage, getRef()); + shard.tell(readyMessage, getRef()); - expectMsgClass(CommitTransactionReply.class); + expectMsgClass(CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); - assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); + } + }; } @Test - public void testReadyLocalTransactionWithThreePhaseCommit() throws Exception{ - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testReadyLocalTransactionWithThreePhaseCommit"); - - waitUntilLeader(shard); + public void testReadyLocalTransactionWithThreePhaseCommit() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testReadyLocalTransactionWithThreePhaseCommit"); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + waitUntilLeader(shard); - final DataTreeModification modification = dataStore.newModification(); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); - final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); - new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); + final DataTreeModification modification = dataStore.newModification(); - final TransactionIdentifier txId = nextTransactionId(); - modification.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, false); + final ContainerNode writeData = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + new WriteModification(TestModel.TEST_PATH, writeData).apply(modification); + final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(); + new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification); - shard.tell(readyMessage, getRef()); + final TransactionIdentifier txId = nextTransactionId(); + modification.ready(); + final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, false); - expectMsgClass(ReadyTransactionReply.class); + shard.tell(readyMessage, getRef()); - // Send the CanCommitTransaction message. + expectMsgClass(ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + // Send the CanCommitTransaction message. - // Send the CanCommitTransaction message. + shard.tell(new CanCommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(new CommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(CommitTransactionReply.class); + // Send the CanCommitTransaction message. - final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); - assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); - }}; - } + shard.tell(new CommitTransaction(txId, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(CommitTransactionReply.class); - @Test - public void testReadWriteCommitWithPersistenceDisabled() throws Throwable { - testCommitWithPersistenceDisabled(true); + final NormalizedNode actualNode = readStore(shard, TestModel.OUTER_LIST_PATH); + assertEquals(TestModel.OUTER_LIST_QNAME.getLocalName(), mergeData, actualNode); + } + }; } @Test - public void testWriteOnlyCommitWithPersistenceDisabled() throws Throwable { - testCommitWithPersistenceDisabled(true); - } - - private void testCommitWithPersistenceDisabled(final boolean readWrite) throws Throwable { + public void testReadWriteCommitWithPersistenceDisabled() throws Exception { dataStoreContextBuilder.persistent(false); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWithPersistenceDisabled-" + readWrite); - - waitUntilLeader(shard); - - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - // Setup a simulated transactions with a mock cohort. + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitWithPersistenceDisabled"); - final TransactionIdentifier transactionID = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); - final ShardDataTreeCohort cohort = setupMockWriteTransaction("cohort", dataStore, - TestModel.TEST_PATH, containerNode, modification); + waitUntilLeader(shard); - final FiniteDuration duration = duration("5 seconds"); + // Setup a simulated transactions with a mock cohort. - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final FiniteDuration duration = duration("5 seconds"); - // Send the CanCommitTransaction message. + final TransactionIdentifier transactionID = nextTransactionId(); + final NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, containerNode, false), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + // Send the CanCommitTransaction message. - // Send the CanCommitTransaction message. + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + // Send the CanCommitTransaction message. - final InOrder inOrder = inOrder(cohort); - inOrder.verify(cohort).canCommit(); - inOrder.verify(cohort).preCommit(); - inOrder.verify(cohort).commit(); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); - assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); - }}; + final NormalizedNode actualNode = readStore(shard, TestModel.TEST_PATH); + assertEquals(TestModel.TEST_QNAME.getLocalName(), containerNode, actualNode); + } + }; } @Test - public void testReadWriteCommitWhenTransactionHasNoModifications() { - testCommitWhenTransactionHasNoModifications(true); + public void testReadWriteCommitWhenTransactionHasModifications() throws Exception { + testCommitWhenTransactionHasModifications(true); } @Test - public void testWriteOnlyCommitWhenTransactionHasNoModifications() { - testCommitWhenTransactionHasNoModifications(false); + public void testWriteOnlyCommitWhenTransactionHasModifications() throws Exception { + testCommitWhenTransactionHasModifications(false); } - private void testCommitWhenTransactionHasNoModifications(final boolean readWrite){ - // Note that persistence is enabled which would normally result in the entry getting written to the journal - // but here that need not happen + private void testCommitWhenTransactionHasModifications(final boolean readWrite) throws Exception { new ShardTestKit(getSystem()) { { + final TipProducingDataTree dataTree = createDelegatingMockDataTree(); final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWhenTransactionHasNoModifications-" + readWrite); + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitWhenTransactionHasModifications-" + readWrite); waitUntilLeader(shard); + final FiniteDuration duration = duration("5 seconds"); final TransactionIdentifier transactionID = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).preCommit(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).commit(); - doReturn(mockUnmodifiedCandidate("cohort1-candidate")).when(cohort).getCandidate(); - final FiniteDuration duration = duration("5 seconds"); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + } - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification), getRef()); expectMsgClass(duration, ReadyTransactionReply.class); // Send the CanCommitTransaction message. shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); assertEquals("Can commit", true, canCommitReply.getCanCommit()); shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); expectMsgClass(duration, CommitTransactionReply.class); - final InOrder inOrder = inOrder(cohort); - inOrder.verify(cohort).canCommit(); - inOrder.verify(cohort).preCommit(); - inOrder.verify(cohort).commit(); + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); + inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); shard.tell(Shard.GET_SHARD_MBEAN_MESSAGE, getRef()); final ShardStats shardStats = expectMsgClass(duration, ShardStats.class); // Use MBean for verification // Committed transaction count should increase as usual - assertEquals(1,shardStats.getCommittedTransactionsCount()); + assertEquals(1, shardStats.getCommittedTransactionsCount()); - // Commit index should not advance because this does not go into the journal - assertEquals(-1, shardStats.getCommitIndex()); + // Commit index should advance as we do not have an empty + // modification + assertEquals(0, shardStats.getCommitIndex()); } }; } @Test - public void testReadWriteCommitWhenTransactionHasModifications() { - testCommitWhenTransactionHasModifications(true); - } - - @Test - public void testWriteOnlyCommitWhenTransactionHasModifications() { - testCommitWhenTransactionHasModifications(false); - } - - private void testCommitWhenTransactionHasModifications(final boolean readWrite){ + public void testCommitPhaseFailure() throws Exception { new ShardTestKit(getSystem()) { { + final TipProducingDataTree dataTree = createDelegatingMockDataTree(); final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitWhenTransactionHasModifications-" + readWrite); + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCommitPhaseFailure"); waitUntilLeader(shard); - final TransactionIdentifier transactionID = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - modification.addModification(new DeleteModification(YangInstanceIdentifier.EMPTY)); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).preCommit(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).commit(); - doReturn(mockCandidate("cohort1-candidate")).when(cohort).getCandidate(); - final FiniteDuration duration = duration("5 seconds"); + final Timeout timeout = new Timeout(duration); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - // Send the CanCommitTransaction message. - - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); - - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); - - final InOrder inOrder = inOrder(cohort); - inOrder.verify(cohort).canCommit(); - inOrder.verify(cohort).preCommit(); - inOrder.verify(cohort).commit(); + // Setup 2 simulated transactions with mock cohorts. The first + // one fails in the + // commit phase. - shard.tell(Shard.GET_SHARD_MBEAN_MESSAGE, getRef()); - final ShardStats shardStats = expectMsgClass(duration, ShardStats.class); + doThrow(new RuntimeException("mock commit failure")).when(dataTree) + .commit(any(DataTreeCandidate.class)); - // Use MBean for verification - // Committed transaction count should increase as usual - assertEquals(1, shardStats.getCommittedTransactionsCount()); - - // Commit index should advance as we do not have an empty modification - assertEquals(0, shardStats.getCommitIndex()); - } - }; - } - - @Test - public void testCommitPhaseFailure() throws Throwable { - testCommitPhaseFailure(true); - testCommitPhaseFailure(false); - } - - private void testCommitPhaseFailure(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCommitPhaseFailure-" + readWrite); - - waitUntilLeader(shard); - - // Setup 2 simulated transactions with mock cohorts. The first one fails in the - // commit phase. - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort1).preCommit(); - doReturn(Futures.immediateFailedFuture(new RuntimeException("mock"))).when(cohort1).commit(); - doReturn(mockCandidate("cohort1-candidate")).when(cohort1).getCandidate(); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit(); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); + // Send the CanCommitTransaction message for the first Tx. - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - // Send the CanCommitTransaction message for the first Tx. + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + // Send the CommitTransaction message for the first Tx. This + // should send back an error + // and trigger the 2nd Tx to proceed. - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, akka.actor.Status.Failure.class); - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + // Wait for the 2nd Tx to complete the canCommit phase. - // Send the CommitTransaction message for the first Tx. This should send back an error - // and trigger the 2nd Tx to proceed. + final CountDownLatch latch = new CountDownLatch(1); + canCommitFuture.onComplete(new OnComplete() { + @Override + public void onComplete(final Throwable failure, final Object resp) { + latch.countDown(); + } + }, getSystem().dispatcher()); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); - // Wait for the 2nd Tx to complete the canCommit phase. + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); - final CountDownLatch latch = new CountDownLatch(1); - canCommitFuture.onComplete(new OnComplete() { - @Override - public void onComplete(final Throwable t, final Object resp) { - latch.countDown(); - } - }, getSystem().dispatcher()); + // FIXME: this invocation is done on the result of validate(). To test it, we need to make sure mock + // validate performs wrapping and we capture that mock + // inOrder.verify(dataTree).validate(any(DataTreeModification.class)); - assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); - - final InOrder inOrder = inOrder(cohort1, cohort2); - inOrder.verify(cohort1).canCommit(); - inOrder.verify(cohort1).preCommit(); - inOrder.verify(cohort1).commit(); - inOrder.verify(cohort2).canCommit(); - }}; + inOrder.verify(dataTree).commit(any(DataTreeCandidate.class)); + } + }; } @Test - public void testPreCommitPhaseFailure() throws Throwable { - testPreCommitPhaseFailure(true); - testPreCommitPhaseFailure(false); - } - - private void testPreCommitPhaseFailure(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testPreCommitPhaseFailure-" + readWrite); - - waitUntilLeader(shard); - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort1).preCommit(); - - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit(); - - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); - - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - // Send the CanCommitTransaction message for the first Tx. - - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); - - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. - - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - - // Send the CommitTransaction message for the first Tx. This should send back an error - // and trigger the 2nd Tx to proceed. - - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); - - // Wait for the 2nd Tx to complete the canCommit phase. - - final CountDownLatch latch = new CountDownLatch(1); - canCommitFuture.onComplete(new OnComplete() { - @Override - public void onComplete(final Throwable t, final Object resp) { - latch.countDown(); - } - }, getSystem().dispatcher()); + public void testPreCommitPhaseFailure() throws Exception { + new ShardTestKit(getSystem()) { + { + final TipProducingDataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testPreCommitPhaseFailure"); - assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); + waitUntilLeader(shard); - final InOrder inOrder = inOrder(cohort1, cohort2); - inOrder.verify(cohort1).canCommit(); - inOrder.verify(cohort1).preCommit(); - inOrder.verify(cohort2).canCommit(); - }}; - } + final FiniteDuration duration = duration("5 seconds"); + final Timeout timeout = new Timeout(duration); - @Test - public void testCanCommitPhaseFailure() throws Throwable { - testCanCommitPhaseFailure(true); - testCanCommitPhaseFailure(false); - } + doThrow(new RuntimeException("mock preCommit failure")).when(dataTree) + .prepare(any(DataTreeModification.class)); - private void testCanCommitPhaseFailure(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCanCommitPhaseFailure-" + readWrite); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - waitUntilLeader(shard); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final FiniteDuration duration = duration("5 seconds"); + // Send the CanCommitTransaction message for the first Tx. - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort).canCommit(); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID1, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - // Send the CanCommitTransaction message. + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + // Send the CommitTransaction message for the first Tx. This + // should send back an error + // and trigger the 2nd Tx to proceed. - // Send another can commit to ensure the failed one got cleaned up. + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, akka.actor.Status.Failure.class); - reset(cohort); + // Wait for the 2nd Tx to complete the canCommit phase. - final TransactionIdentifier transactionID2 = nextTransactionId(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); + final CountDownLatch latch = new CountDownLatch(1); + canCommitFuture.onComplete(new OnComplete() { + @Override + public void onComplete(final Throwable failure, final Object resp) { + latch.countDown(); + } + }, getSystem().dispatcher()); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + assertEquals("2nd CanCommit complete", true, latch.await(5, TimeUnit.SECONDS)); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply reply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("getCanCommit", true, reply.getCanCommit()); - }}; + final InOrder inOrder = inOrder(dataTree); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + inOrder.verify(dataTree).prepare(any(DataTreeModification.class)); + inOrder.verify(dataTree).validate(any(DataTreeModification.class)); + } + }; } @Test - public void testCanCommitPhaseFalseResponse() throws Throwable { - testCanCommitPhaseFalseResponse(true); - testCanCommitPhaseFalseResponse(false); - } - - private void testCanCommitPhaseFalseResponse(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCanCommitPhaseFalseResponse-" + readWrite); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); + public void testCanCommitPhaseFailure() throws Exception { + new ShardTestKit(getSystem()) { + { + final TipProducingDataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCanCommitPhaseFailure"); - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.FALSE)).when(cohort).canCommit(); + waitUntilLeader(shard); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID1, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final FiniteDuration duration = duration("5 seconds"); + final TransactionIdentifier transactionID1 = nextTransactionId(); - // Send the CanCommitTransaction message. + doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + .doNothing().when(dataTree).validate(any(DataTreeModification.class)); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - CanCommitTransactionReply reply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("getCanCommit", false, reply.getCanCommit()); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Send another can commit to ensure the failed one got cleaned up. + // Send the CanCommitTransaction message. - reset(cohort); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, akka.actor.Status.Failure.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); + // Send another can commit to ensure the failed one got cleaned + // up. - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - reply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(CanCommitTransactionReply.class)); - assertEquals("getCanCommit", true, reply.getCanCommit()); - }}; + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + final CanCommitTransactionReply reply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(CanCommitTransactionReply.class)); + assertEquals("getCanCommit", true, reply.getCanCommit()); + } + }; } @Test - public void testImmediateCommitWithCanCommitPhaseFailure() throws Throwable { + public void testImmediateCommitWithCanCommitPhaseFailure() throws Exception { testImmediateCommitWithCanCommitPhaseFailure(true); testImmediateCommitWithCanCommitPhaseFailure(false); } - private void testImmediateCommitWithCanCommitPhaseFailure(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testImmediateCommitWithCanCommitPhaseFailure-" + readWrite); - - waitUntilLeader(shard); + private void testImmediateCommitWithCanCommitPhaseFailure(final boolean readWrite) throws Exception { + new ShardTestKit(getSystem()) { + { + final TipProducingDataTree dataTree = createDelegatingMockDataTree(); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().dataTree(dataTree).props().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testImmediateCommitWithCanCommitPhaseFailure-" + readWrite); - final FiniteDuration duration = duration("5 seconds"); + waitUntilLeader(shard); - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort).canCommit(); + doThrow(new DataValidationFailedException(YangInstanceIdentifier.EMPTY, "mock canCommit failure")) + .doNothing().when(dataTree).validate(any(DataTreeModification.class)); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID1, modification, true), getRef()); + final FiniteDuration duration = duration("5 seconds"); - expectMsgClass(duration, akka.actor.Status.Failure.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); - // Send another can commit to ensure the failed one got cleaned up. + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); + } - reset(cohort); + expectMsgClass(duration, akka.actor.Status.Failure.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort).preCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort).commit(); - final DataTreeCandidateTip candidate = mock(DataTreeCandidateTip.class); - final DataTreeCandidateNode candidateRoot = mock(DataTreeCandidateNode.class); - doReturn(ModificationType.UNMODIFIED).when(candidateRoot).getModificationType(); - doReturn(candidateRoot).when(candidate).getRootNode(); - doReturn(YangInstanceIdentifier.EMPTY).when(candidate).getRootPath(); - doReturn(candidate).when(cohort).getCandidate(); + // Send another can commit to ensure the failed one got cleaned + // up. - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification, true), getRef()); + final TransactionIdentifier transactionID2 = nextTransactionId(); + if (readWrite) { + shard.tell(prepareForwardedReadyTransaction(shard, transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); + } else { + shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true), getRef()); + } - expectMsgClass(duration, CommitTransactionReply.class); - }}; + expectMsgClass(duration, CommitTransactionReply.class); + } + }; } @Test - public void testImmediateCommitWithCanCommitPhaseFalseResponse() throws Throwable { - testImmediateCommitWithCanCommitPhaseFalseResponse(true); - testImmediateCommitWithCanCommitPhaseFalseResponse(false); - } - - private void testImmediateCommitWithCanCommitPhaseFalseResponse(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testImmediateCommitWithCanCommitPhaseFalseResponse-" + readWrite); - - waitUntilLeader(shard); + public void testAbortWithCommitPending() throws Exception { + new ShardTestKit(getSystem()) { + { + final Creator creator = () -> new Shard(newShardBuilder()) { + @Override + void persistPayload(final TransactionIdentifier transactionId, final Payload payload, + boolean batchHint) { + // Simulate an AbortTransaction message occurring during + // replication, after + // persisting and before finishing the commit to the + // in-memory store. + + doAbortTransaction(transactionId, null); + super.persistPayload(transactionId, payload, batchHint); + } + }; - final FiniteDuration duration = duration("5 seconds"); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testAbortWithCommitPending"); - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.FALSE)).when(cohort).canCommit(); + waitUntilLeader(shard); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID1, modification, true), getRef()); + final FiniteDuration duration = duration("5 seconds"); - expectMsgClass(duration, akka.actor.Status.Failure.class); + final TransactionIdentifier transactionID = nextTransactionId(); - // Send another can commit to ensure the failed one got cleaned up. + shard.tell(prepareBatchedModifications(transactionID, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - reset(cohort); + shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - final TransactionIdentifier transactionID2 = nextTransactionId(); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort).preCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort).commit(); - final DataTreeCandidateTip candidate = mock(DataTreeCandidateTip.class); - final DataTreeCandidateNode candidateRoot = mock(DataTreeCandidateNode.class); - doReturn(ModificationType.UNMODIFIED).when(candidateRoot).getModificationType(); - doReturn(candidateRoot).when(candidate).getRootNode(); - doReturn(YangInstanceIdentifier.EMPTY).when(candidate).getRootPath(); - doReturn(candidate).when(cohort).getCandidate(); + shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification, true), getRef()); + final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); - expectMsgClass(duration, CommitTransactionReply.class); - }}; + // Since we're simulating an abort occurring during replication + // and before finish commit, + // the data should still get written to the in-memory store + // since we've gotten past + // canCommit and preCommit and persisted the data. + assertNotNull(TestModel.TEST_QNAME.getLocalName() + " not found", node); + } + }; } @Test - public void testAbortBeforeFinishCommit() throws Throwable { - testAbortBeforeFinishCommit(true); - testAbortBeforeFinishCommit(false); - } + public void testTransactionCommitTimeout() throws Exception { + dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitTimeout"); - private void testAbortBeforeFinishCommit(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testAbortBeforeFinishCommit-" + readWrite); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - final TransactionIdentifier transactionID = nextTransactionId(); - final Function> preCommit = - cohort -> { - final ListenableFuture preCommitFuture = cohort.preCommit(); - - // Simulate an AbortTransaction message occurring during replication, after - // persisting and before finishing the commit to the in-memory store. - // We have no followers so due to optimizations in the RaftActor, it does not - // attempt replication and thus we can't send an AbortTransaction message b/c - // it would be processed too late after CommitTransaction completes. So we'll - // simulate an AbortTransaction message occurring during replication by calling - // the shard directly. - // - shard.underlyingActor().doAbortTransaction(transactionID, null); - - return preCommitFuture; - }; - - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = setupMockWriteTransaction("cohort1", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), - modification, preCommit); - - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); - - shard.tell(new CommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); - - final NormalizedNode node = readStore(shard, TestModel.TEST_PATH); - - // Since we're simulating an abort occurring during replication and before finish commit, - // the data should still get written to the in-memory store since we've gotten past - // canCommit and preCommit and persisted the data. - assertNotNull(TestModel.TEST_QNAME.getLocalName() + " not found", node); - }}; - } + waitUntilLeader(shard); - @Test - public void testTransactionCommitTimeout() throws Throwable { - testTransactionCommitTimeout(true); - testTransactionCommitTimeout(false); - } + final FiniteDuration duration = duration("5 seconds"); - private void testTransactionCommitTimeout(final boolean readWrite) throws Throwable { - dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); + writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + writeToStore(shard, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitTimeout-" + readWrite); + // Ready 2 Tx's - the first will timeout - waitUntilLeader(shard); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell( + prepareBatchedModifications(transactionID1, + YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), false), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final FiniteDuration duration = duration("5 seconds"); + final TransactionIdentifier transactionID2 = nextTransactionId(); + final YangInstanceIdentifier listNodePath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) + .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(); + shard.tell( + prepareBatchedModifications(transactionID2, listNodePath, + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2), false), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + // canCommit 1st Tx. We don't send the commit so it should + // timeout. - writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - writeToStore(shard, TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - // Create 1st Tx - will timeout + // canCommit the 2nd Tx - it should complete after the 1st Tx + // times out. - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, - YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(), - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1), - modification1); + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - // Create 2nd Tx + // Try to commit the 1st Tx - should fail as it's not the + // current Tx. - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final YangInstanceIdentifier listNodePath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH) - .nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(); - final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort3", dataStore, - listNodePath, - ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2), - modification2); + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, akka.actor.Status.Failure.class); - // Ready the Tx's + // Commit the 2nd Tx. - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(new CommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final NormalizedNode node = readStore(shard, listNodePath); + assertNotNull(listNodePath + " not found", node); + } + }; + } - // canCommit 1st Tx. We don't send the commit so it should timeout. +// @Test +// @Ignore +// public void testTransactionCommitQueueCapacityExceeded() throws Throwable { +// dataStoreContextBuilder.shardTransactionCommitQueueCapacity(2); +// +// new ShardTestKit(getSystem()) {{ +// final TestActorRef shard = actorFactory.createTestActor( +// newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), +// "testTransactionCommitQueueCapacityExceeded"); +// +// waitUntilLeader(shard); +// +// final FiniteDuration duration = duration("5 seconds"); +// +// final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); +// +// final TransactionIdentifier transactionID1 = nextTransactionId(); +// final MutableCompositeModification modification1 = new MutableCompositeModification(); +// final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, +// TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), transactionID1, +// modification1); +// +// final TransactionIdentifier transactionID2 = nextTransactionId(); +// final MutableCompositeModification modification2 = new MutableCompositeModification(); +// final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore, +// TestModel.OUTER_LIST_PATH, +// ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), transactionID2, +// modification2); +// +// final TransactionIdentifier transactionID3 = nextTransactionId(); +// final MutableCompositeModification modification3 = new MutableCompositeModification(); +// final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore, +// TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), transactionID3, +// modification3); +// +// // Ready the Tx's +// +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, +// modification1), getRef()); +// expectMsgClass(duration, ReadyTransactionReply.class); +// +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, +// modification2), getRef()); +// expectMsgClass(duration, ReadyTransactionReply.class); +// +// // The 3rd Tx should exceed queue capacity and fail. +// +// shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, +// modification3), getRef()); +// expectMsgClass(duration, akka.actor.Status.Failure.class); +// +// // canCommit 1st Tx. +// +// shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); +// expectMsgClass(duration, CanCommitTransactionReply.class); +// +// // canCommit the 2nd Tx - it should get queued. +// +// shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); +// +// // canCommit the 3rd Tx - should exceed queue capacity and fail. +// +// shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); +// expectMsgClass(duration, akka.actor.Status.Failure.class); +// }}; +// } - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + @Test + public void testTransactionCommitWithPriorExpiredCohortEntries() throws Exception { + dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitWithPriorExpiredCohortEntries"); - // canCommit the 2nd Tx - it should complete after the 1st Tx times out. + waitUntilLeader(shard); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + final FiniteDuration duration = duration("5 seconds"); - // Try to commit the 1st Tx - should fail as it's not the current Tx. + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Commit the 2nd Tx. + final TransactionIdentifier transactionID3 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID3, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + // All Tx's are readied. We'll send canCommit for the last one + // but not the others. The others + // should expire from the queue and the last one should be + // processed. - final NormalizedNode node = readStore(shard, listNodePath); - assertNotNull(listNodePath + " not found", node); - }}; + shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); + } + }; } @Test - public void testTransactionCommitQueueCapacityExceeded() throws Throwable { - dataStoreContextBuilder.shardTransactionCommitQueueCapacity(2); - - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitQueueCapacityExceeded"); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); + public void testTransactionCommitWithSubsequentExpiredCohortEntry() throws Exception { + dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testTransactionCommitWithSubsequentExpiredCohortEntry"); - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); + waitUntilLeader(shard); - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1); + final FiniteDuration duration = duration("5 seconds"); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore, - TestModel.OUTER_LIST_PATH, - ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), - modification2); + final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - final TransactionIdentifier transactionID3 = nextTransactionId(); - final MutableCompositeModification modification3 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification3); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(prepareBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Ready the Tx's + // CanCommit the first Tx so it's the current in-progress Tx. - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Ready the second Tx. - // The 3rd Tx should exceed queue capacity and fail. + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(prepareBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), false), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, modification3), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); + // Ready the third Tx. - // canCommit 1st Tx. + final TransactionIdentifier transactionID3 = nextTransactionId(); + final DataTreeModification modification3 = dataStore.newModification(); + new WriteModification(TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME)) + .apply(modification3); + modification3.ready(); + final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(transactionID3, modification3, + true); + shard.tell(readyMessage, getRef()); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + // Commit the first Tx. After completing, the second should + // expire from the queue and the third + // Tx committed. - // canCommit the 2nd Tx - it should get queued. + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + // Expect commit reply from the third Tx. - // canCommit the 3rd Tx - should exceed queue capacity and fail. + expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, akka.actor.Status.Failure.class); - }}; + final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); + assertNotNull(TestModel.TEST2_PATH + " not found", node); + } + }; } @Test - public void testTransactionCommitWithPriorExpiredCohortEntries() throws Throwable { - dataStoreContextBuilder.shardCommitQueueExpiryTimeoutInMillis(1300).shardTransactionCommitTimeoutInSeconds(1); - - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitWithPriorExpiredCohortEntries"); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); - - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1); - - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification2); - - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - final TransactionIdentifier transactionID3 = nextTransactionId(); - final MutableCompositeModification modification3 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore, - TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME), modification3); - - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort3, transactionID3, modification3), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - // All Tx's are readied. We'll send canCommit for the last one but not the others. The others - // should expire from the queue and the last one should be processed. + public void testCanCommitBeforeReadyFailure() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), + "testCanCommitBeforeReadyFailure"); - shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); - }}; + shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); + } + }; } @Test - public void testTransactionCommitWithSubsequentExpiredCohortEntry() throws Throwable { - dataStoreContextBuilder.shardCommitQueueExpiryTimeoutInMillis(1300).shardTransactionCommitTimeoutInSeconds(1); - - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testTransactionCommitWithSubsequentExpiredCohortEntry"); - - waitUntilLeader(shard); - - final FiniteDuration duration = duration("5 seconds"); - - final ShardDataTree dataStore = shard.underlyingActor().getDataStore(); - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1); - - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); - - // CanCommit the first one so it's the current in-progress CohortEntry. + public void testAbortAfterCanCommit() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterCanCommit"); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CanCommitTransactionReply.class); + waitUntilLeader(shard); - // Ready the second Tx. + final FiniteDuration duration = duration("5 seconds"); + final Timeout timeout = new Timeout(duration); - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore, - TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification2); + // Ready 2 transactions - the first one will be aborted. - shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Ready the third Tx. + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final TransactionIdentifier transactionID3 = nextTransactionId(); - final DataTreeModification modification3 = dataStore.newModification(); - new WriteModification(TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME)) - .apply(modification3); - modification3.ready(); - final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(transactionID3, modification3, true); + // Send the CanCommitTransaction message for the first Tx. - shard.tell(readyMessage, getRef()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + CanCommitTransactionReply canCommitReply = CanCommitTransactionReply + .fromSerializable(expectMsgClass(duration, CanCommitTransactionReply.class)); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); - // Commit the first Tx. After completing, the second should expire from the queue and the third - // Tx committed. + // Send the CanCommitTransaction message for the 2nd Tx. This + // should get queued and + // processed after the first Tx completes. - shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, CommitTransactionReply.class); + final Future canCommitFuture = Patterns.ask(shard, + new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); - // Expect commit reply from the third Tx. + // Send the AbortTransaction message for the first Tx. This + // should trigger the 2nd + // Tx to proceed. - expectMsgClass(duration, CommitTransactionReply.class); + shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, AbortTransactionReply.class); - final NormalizedNode node = readStore(shard, TestModel.TEST2_PATH); - assertNotNull(TestModel.TEST2_PATH + " not found", node); - }}; - } + // Wait for the 2nd Tx to complete the canCommit phase. - @Test - public void testCanCommitBeforeReadyFailure() throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testCanCommitBeforeReadyFailure"); - - shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class); - }}; + canCommitReply = (CanCommitTransactionReply) Await.result(canCommitFuture, duration); + assertEquals("Can commit", true, canCommitReply.getCanCommit()); + } + }; } @Test - public void testAbortCurrentTransaction() throws Throwable { - testAbortCurrentTransaction(true); - testAbortCurrentTransaction(false); - } - - private void testAbortCurrentTransaction(final boolean readWrite) throws Throwable { - new ShardTestKit(getSystem()) {{ - final TestActorRef shard = actorFactory.createTestActor( - newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), - "testAbortCurrentTransaction-" + readWrite); - - waitUntilLeader(shard); - - // Setup 2 simulated transactions with mock cohorts. The first one will be aborted. - - final TransactionIdentifier transactionID1 = nextTransactionId(); - final MutableCompositeModification modification1 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(cohort1).abort(); - - final TransactionIdentifier transactionID2 = nextTransactionId(); - final MutableCompositeModification modification2 = new MutableCompositeModification(); - final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2"); - doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit(); + public void testAbortAfterReady() throws Exception { + dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); - final FiniteDuration duration = duration("5 seconds"); - final Timeout timeout = new Timeout(duration); + waitUntilLeader(shard); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + final FiniteDuration duration = duration("5 seconds"); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Ready a tx. - // Send the CanCommitTransaction message for the first Tx. + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - final CanCommitTransactionReply canCommitReply = CanCommitTransactionReply.fromSerializable( - expectMsgClass(duration, CanCommitTransactionReply.class)); - assertEquals("Can commit", true, canCommitReply.getCanCommit()); + // Send the AbortTransaction message. - // Send the CanCommitTransaction message for the 2nd Tx. This should get queued and - // processed after the first Tx completes. + shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, AbortTransactionReply.class); - final Future canCommitFuture = Patterns.ask(shard, - new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), timeout); + assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); - // Send the AbortTransaction message for the first Tx. This should trigger the 2nd - // Tx to proceed. + // Now send CanCommitTransaction - should fail. - shard.tell(new AbortTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, AbortTransactionReply.class); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + final Throwable failure = expectMsgClass(duration, akka.actor.Status.Failure.class).cause(); + assertTrue("Failure type", failure instanceof IllegalStateException); - // Wait for the 2nd Tx to complete the canCommit phase. + // Ready and CanCommit another and verify success. - Await.ready(canCommitFuture, duration); + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - final InOrder inOrder = inOrder(cohort1, cohort2); - inOrder.verify(cohort1).canCommit(); - inOrder.verify(cohort2).canCommit(); - }}; + shard.tell(new CanCommitTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); + } + }; } @Test - public void testAbortQueuedTransaction() throws Throwable { - testAbortQueuedTransaction(true); - testAbortQueuedTransaction(false); - } - - private void testAbortQueuedTransaction(final boolean readWrite) throws Throwable { - dataStoreContextBuilder.shardTransactionCommitTimeoutInSeconds(1); - new ShardTestKit(getSystem()) {{ - final AtomicReference cleaupCheckLatch = new AtomicReference<>(); - @SuppressWarnings("serial") - final Creator creator = () -> new Shard(newShardBuilder()) { - @Override - public void handleCommand(final Object message) { - super.handleCommand(message); - if(TX_COMMIT_TIMEOUT_CHECK_MESSAGE.equals(message)) { - if(cleaupCheckLatch.get() != null) { - cleaupCheckLatch.get().countDown(); - } - } - } - }; - - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)).withDispatcher( - Dispatchers.DefaultDispatcherId()), "testAbortQueuedTransaction-" + readWrite); - - waitUntilLeader(shard); - - final TransactionIdentifier transactionID = nextTransactionId(); - final MutableCompositeModification modification = new MutableCompositeModification(); - final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort"); - doReturn(Futures.immediateFuture(null)).when(cohort).abort(); + public void testAbortQueuedTransaction() throws Exception { + new ShardTestKit(getSystem()) { + { + final TestActorRef shard = actorFactory.createTestActor( + newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testAbortAfterReady"); - final FiniteDuration duration = duration("5 seconds"); + waitUntilLeader(shard); - // Ready the tx. + final FiniteDuration duration = duration("5 seconds"); - shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification), getRef()); - expectMsgClass(duration, ReadyTransactionReply.class); + // Ready 3 tx's. - assertEquals("getPendingTxCommitQueueSize", 1, shard.underlyingActor().getPendingTxCommitQueueSize()); + final TransactionIdentifier transactionID1 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID1, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - // Send the AbortTransaction message. + final TransactionIdentifier transactionID2 = nextTransactionId(); + shard.tell(newBatchedModifications(transactionID2, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME), true, false, 1), getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - shard.tell(new AbortTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); - expectMsgClass(duration, AbortTransactionReply.class); + final TransactionIdentifier transactionID3 = nextTransactionId(); + shard.tell( + newBatchedModifications(transactionID3, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(), true, false, 1), + getRef()); + expectMsgClass(duration, ReadyTransactionReply.class); - verify(cohort).abort(); + // Abort the second tx while it's queued. - // Verify the tx cohort is removed from queue at the cleanup check interval. + shard.tell(new AbortTransaction(transactionID2, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, AbortTransactionReply.class); - cleaupCheckLatch.set(new CountDownLatch(1)); - assertEquals("TX_COMMIT_TIMEOUT_CHECK_MESSAGE received", true, - cleaupCheckLatch.get().await(5, TimeUnit.SECONDS)); + // Commit the other 2. - assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); + shard.tell(new CanCommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - // Now send CanCommitTransaction - should fail. + shard.tell(new CommitTransaction(transactionID1, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - shard.tell(new CanCommitTransaction(transactionID, CURRENT_VERSION).toSerializable(), getRef()); + shard.tell(new CanCommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CanCommitTransactionReply.class); - Throwable failure = expectMsgClass(duration, akka.actor.Status.Failure.class).cause(); - assertTrue("Failure type", failure instanceof IllegalStateException); - }}; - } + shard.tell(new CommitTransaction(transactionID3, CURRENT_VERSION).toSerializable(), getRef()); + expectMsgClass(duration, CommitTransactionReply.class); - @Test - public void testCreateSnapshot() throws Exception { - testCreateSnapshot(true, "testCreateSnapshot"); + assertEquals("getPendingTxCommitQueueSize", 0, shard.underlyingActor().getPendingTxCommitQueueSize()); + } + }; } @Test @@ -2061,8 +1892,12 @@ public class ShardTest extends AbstractShardTest { testCreateSnapshot(false, "testCreateSnapshotWithNonPersistentData"); } - private void testCreateSnapshot(final boolean persistent, final String shardActorName) throws Exception{ + @Test + public void testCreateSnapshot() throws Exception { + testCreateSnapshot(true, "testCreateSnapshot"); + } + private void testCreateSnapshot(final boolean persistent, final String shardActorName) throws Exception { final AtomicReference latch = new AtomicReference<>(new CountDownLatch(1)); final AtomicReference savedSnapshot = new AtomicReference<>(); @@ -2072,80 +1907,82 @@ public class ShardTest extends AbstractShardTest { } @Override - public void saveSnapshot(final Object o) { - savedSnapshot.set(o); - super.saveSnapshot(o); + public void saveSnapshot(final Object obj) { + savedSnapshot.set(obj); + super.saveSnapshot(obj); } } dataStoreContextBuilder.persistent(persistent); - new ShardTestKit(getSystem()) {{ - class TestShard extends Shard { + class TestShard extends Shard { - protected TestShard(AbstractBuilder builder) { - super(builder); - setPersistence(new TestPersistentDataProvider(super.persistence())); - } + protected TestShard(final AbstractBuilder builder) { + super(builder); + setPersistence(new TestPersistentDataProvider(super.persistence())); + } - @Override - public void handleCommand(final Object message) { - super.handleCommand(message); + @Override + public void handleCommand(final Object message) { + super.handleCommand(message); - // XXX: commit_snapshot equality check references RaftActorSnapshotMessageSupport.COMMIT_SNAPSHOT - if (message instanceof SaveSnapshotSuccess || "commit_snapshot".equals(message.toString())) { - latch.get().countDown(); - } + // XXX: commit_snapshot equality check references RaftActorSnapshotMessageSupport.COMMIT_SNAPSHOT + if (message instanceof SaveSnapshotSuccess || "commit_snapshot".equals(message.toString())) { + latch.get().countDown(); } + } - @Override - public RaftActorContext getRaftActorContext() { - return super.getRaftActorContext(); - } + @Override + public RaftActorContext getRaftActorContext() { + return super.getRaftActorContext(); } + } - final Creator creator = () -> new TestShard(newShardBuilder()); + new ShardTestKit(getSystem()) { + { + final Creator creator = () -> new TestShard(newShardBuilder()); - final TestActorRef shard = actorFactory.createTestActor( - Props.create(new DelegatingShardCreator(creator)). - withDispatcher(Dispatchers.DefaultDispatcherId()), shardActorName); + final TestActorRef shard = actorFactory.createTestActor(Props + .create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + shardActorName); - waitUntilLeader(shard); - writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + waitUntilLeader(shard); + writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY); + final NormalizedNode expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY); - // Trigger creation of a snapshot by ensuring - final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext(); - raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); - awaitAndValidateSnapshot(expectedRoot); + // Trigger creation of a snapshot by ensuring + final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext(); + raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); + awaitAndValidateSnapshot(expectedRoot); - raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); - awaitAndValidateSnapshot(expectedRoot); - } + raftActorContext.getSnapshotManager().capture(mock(ReplicatedLogEntry.class), -1); + awaitAndValidateSnapshot(expectedRoot); + } - private void awaitAndValidateSnapshot(NormalizedNode expectedRoot) throws InterruptedException, IOException { - assertEquals("Snapshot saved", true, latch.get().await(5, TimeUnit.SECONDS)); + private void awaitAndValidateSnapshot(final NormalizedNode expectedRoot) + throws InterruptedException, IOException { + assertEquals("Snapshot saved", true, latch.get().await(5, TimeUnit.SECONDS)); - assertTrue("Invalid saved snapshot " + savedSnapshot.get(), - savedSnapshot.get() instanceof Snapshot); + assertTrue("Invalid saved snapshot " + savedSnapshot.get(), savedSnapshot.get() instanceof Snapshot); - verifySnapshot((Snapshot)savedSnapshot.get(), expectedRoot); + verifySnapshot((Snapshot) savedSnapshot.get(), expectedRoot); - latch.set(new CountDownLatch(1)); - savedSnapshot.set(null); - } + latch.set(new CountDownLatch(1)); + savedSnapshot.set(null); + } - private void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) throws IOException { - final NormalizedNode actual = ShardDataTreeSnapshot.deserialize(snapshot.getState()).getRootNode().get(); - assertEquals("Root node", expectedRoot, actual); - }}; + private void verifySnapshot(final Snapshot snapshot, final NormalizedNode expectedRoot) + throws IOException { + final NormalizedNode actual = ((ShardSnapshotState)snapshot.getState()).getSnapshot() + .getRootNode().get(); + assertEquals("Root node", expectedRoot, actual); + } + }; } /** - * This test simply verifies that the applySnapShot logic will work - * @throws ReadFailedException - * @throws DataValidationFailedException + * This test simply verifies that the applySnapShot logic will work. */ @Test public void testInMemoryDataTreeRestore() throws ReadFailedException, DataValidationFailedException { @@ -2173,53 +2010,58 @@ public class ShardTest extends AbstractShardTest { } @Test - public void testRecoveryApplicable(){ + public void testRecoveryApplicable() { - final DatastoreContext persistentContext = DatastoreContext.newBuilder(). - shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(true).build(); + final DatastoreContext persistentContext = DatastoreContext.newBuilder() + .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(true).build(); - final Props persistentProps = Shard.builder().id(shardID).datastoreContext(persistentContext). - schemaContext(SCHEMA_CONTEXT).props(); + final Props persistentProps = Shard.builder().id(shardID).datastoreContext(persistentContext) + .schemaContext(SCHEMA_CONTEXT).props(); - final DatastoreContext nonPersistentContext = DatastoreContext.newBuilder(). - shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(false).build(); + final DatastoreContext nonPersistentContext = DatastoreContext.newBuilder() + .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).persistent(false).build(); - final Props nonPersistentProps = Shard.builder().id(shardID).datastoreContext(nonPersistentContext). - schemaContext(SCHEMA_CONTEXT).props(); + final Props nonPersistentProps = Shard.builder().id(shardID).datastoreContext(nonPersistentContext) + .schemaContext(SCHEMA_CONTEXT).props(); - new ShardTestKit(getSystem()) {{ - final TestActorRef shard1 = actorFactory.createTestActor(persistentProps, "testPersistence1"); + new ShardTestKit(getSystem()) { + { + final TestActorRef shard1 = actorFactory.createTestActor(persistentProps, "testPersistence1"); - assertTrue("Recovery Applicable", shard1.underlyingActor().persistence().isRecoveryApplicable()); + assertTrue("Recovery Applicable", shard1.underlyingActor().persistence().isRecoveryApplicable()); - final TestActorRef shard2 = actorFactory.createTestActor(nonPersistentProps, "testPersistence2"); + final TestActorRef shard2 = actorFactory.createTestActor(nonPersistentProps, "testPersistence2"); - assertFalse("Recovery Not Applicable", shard2.underlyingActor().persistence().isRecoveryApplicable()); - }}; + assertFalse("Recovery Not Applicable", shard2.underlyingActor().persistence().isRecoveryApplicable()); + } + }; } @Test public void testOnDatastoreContext() { - new ShardTestKit(getSystem()) {{ - dataStoreContextBuilder.persistent(true); + new ShardTestKit(getSystem()) { + { + dataStoreContextBuilder.persistent(true); - final TestActorRef shard = actorFactory.createTestActor(newShardProps(), "testOnDatastoreContext"); + final TestActorRef shard = actorFactory.createTestActor(newShardProps(), + "testOnDatastoreContext"); - assertEquals("isRecoveryApplicable", true, - shard.underlyingActor().persistence().isRecoveryApplicable()); + assertEquals("isRecoveryApplicable", true, + shard.underlyingActor().persistence().isRecoveryApplicable()); - waitUntilLeader(shard); + waitUntilLeader(shard); - shard.tell(dataStoreContextBuilder.persistent(false).build(), ActorRef.noSender()); + shard.tell(dataStoreContextBuilder.persistent(false).build(), ActorRef.noSender()); - assertEquals("isRecoveryApplicable", false, - shard.underlyingActor().persistence().isRecoveryApplicable()); + assertEquals("isRecoveryApplicable", false, + shard.underlyingActor().persistence().isRecoveryApplicable()); - shard.tell(dataStoreContextBuilder.persistent(true).build(), ActorRef.noSender()); + shard.tell(dataStoreContextBuilder.persistent(true).build(), ActorRef.noSender()); - assertEquals("isRecoveryApplicable", true, - shard.underlyingActor().persistence().isRecoveryApplicable()); - }}; + assertEquals("isRecoveryApplicable", true, + shard.underlyingActor().persistence().isRecoveryApplicable()); + } + }; } @Test @@ -2266,165 +2108,179 @@ public class ShardTest extends AbstractShardTest { newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()), "testFollowerInitialSyncStatus"); - shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(false, "member-1-shard-inventory-operational")); + shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(false, + "member-1-shard-inventory-operational")); assertEquals(false, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); - shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(true, "member-1-shard-inventory-operational")); + shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(true, + "member-1-shard-inventory-operational")); assertEquals(true, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus()); } @Test public void testClusteredDataChangeListenerDelayedRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - String testName = "testClusteredDataChangeListenerDelayedRegistration"; - dataStoreContextBuilder.shardElectionTimeoutFactor(1000). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - actorFactory.generateActorId(testName + "-DataChangeListener")); + new ShardTestKit(getSystem()) { + { + final String testName = "testClusteredDataChangeListenerDelayedRegistration"; + dataStoreContextBuilder.shardElectionTimeoutFactor(1000) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - setupInMemorySnapshotStore(); + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataChangeListener listener = new MockDataChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path), + actorFactory.generateActorId(testName + "-DataChangeListener")); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), - actorFactory.generateActorId(testName + "-shard")); + setupInMemorySnapshotStore(); - waitUntilNoLeader(shard); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), + actorFactory.generateActorId(testName + "-shard")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; + waitUntilNoLeader(shard); - shard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + shard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), + getRef()); + final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterChangeListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - listener.waitForChangeEvents(); - }}; + listener.waitForChangeEvents(); + } + }; } @Test public void testClusteredDataChangeListenerRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - String testName = "testClusteredDataChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - - final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); - - final TestActorRef followerShard = actorFactory.createTestActor( - Shard.builder().id(followerShardID). - datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()). - peerAddresses(Collections.singletonMap(leaderShardID.toString(), - "akka://test/user/" + leaderShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); - - final TestActorRef leaderShard = actorFactory.createTestActor( - Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()). - peerAddresses(Collections.singletonMap(followerShardID.toString(), - "akka://test/user/" + followerShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); - - leaderShard.tell(ElectionTimeout.INSTANCE, ActorRef.noSender()); - String leaderPath = waitUntilLeader(followerShard); - assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - final MockDataChangeListener listener = new MockDataChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener), - actorFactory.generateActorId(testName + "-DataChangeListener")); - - followerShard.tell(new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), getRef()); - final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterChangeListenerReply.class); - assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); - - writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - listener.waitForChangeEvents(); - }}; + new ShardTestKit(getSystem()) { + { + final String testName = "testClusteredDataChangeListenerRegistration"; + final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); + + final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); + + final TestActorRef followerShard = actorFactory + .createTestActor(Shard.builder().id(followerShardID) + .datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()) + .peerAddresses(Collections.singletonMap(leaderShardID.toString(), + "akka://test/user/" + leaderShardID.toString())) + .schemaContext(SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); + + final TestActorRef leaderShard = actorFactory + .createTestActor(Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()) + .peerAddresses(Collections.singletonMap(followerShardID.toString(), + "akka://test/user/" + followerShardID.toString())) + .schemaContext(SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); + + leaderShard.tell(TimeoutNow.INSTANCE, ActorRef.noSender()); + final String leaderPath = waitUntilLeader(followerShard); + assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); + + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataChangeListener listener = new MockDataChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataChangeListener.props(listener, path), + actorFactory.generateActorId(testName + "-DataChangeListener")); + + followerShard.tell( + new RegisterChangeListener(path, dclActor, AsyncDataBroker.DataChangeScope.BASE, true), + getRef()); + final RegisterChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterChangeListenerReply.class); + assertNotNull("getListenerRegistratioznPath", reply.getListenerRegistrationPath()); + + writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + + listener.waitForChangeEvents(); + } + }; } @Test public void testClusteredDataTreeChangeListenerDelayedRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - String testName = "testClusteredDataTreeChangeListenerDelayedRegistration"; - dataStoreContextBuilder.shardElectionTimeoutFactor(1000). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - actorFactory.generateActorId(testName + "-DataTreeChangeListener")); + new ShardTestKit(getSystem()) { + { + final String testName = "testClusteredDataTreeChangeListenerDelayedRegistration"; + dataStoreContextBuilder.shardElectionTimeoutFactor(1000) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - setupInMemorySnapshotStore(); + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, + TestModel.TEST_PATH), actorFactory.generateActorId(testName + "-DataTreeChangeListener")); - final TestActorRef shard = actorFactory.createTestActor( - newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), - actorFactory.generateActorId(testName + "-shard")); + setupInMemorySnapshotStore(); - waitUntilNoLeader(shard); + final TestActorRef shard = actorFactory.createTestActor( + newShardBuilder().props().withDispatcher(Dispatchers.DefaultDispatcherId()), + actorFactory.generateActorId(testName + "-shard")); - final YangInstanceIdentifier path = TestModel.TEST_PATH; + waitUntilNoLeader(shard); - shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + shard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); + final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterDataTreeChangeListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + shard.tell(DatastoreContext.newBuilderFrom(dataStoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - listener.waitForChangeEvents(); - }}; + listener.waitForChangeEvents(); + } + }; } @Test public void testClusteredDataTreeChangeListenerRegistration() throws Exception { - new ShardTestKit(getSystem()) {{ - String testName = "testClusteredDataTreeChangeListenerRegistration"; - final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); - - final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", - MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); - - final TestActorRef followerShard = actorFactory.createTestActor( - Shard.builder().id(followerShardID). - datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()). - peerAddresses(Collections.singletonMap(leaderShardID.toString(), - "akka://test/user/" + leaderShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); - - final TestActorRef leaderShard = actorFactory.createTestActor( - Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()). - peerAddresses(Collections.singletonMap(followerShardID.toString(), - "akka://test/user/" + followerShardID.toString())).schemaContext(SCHEMA_CONTEXT).props(). - withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); - - leaderShard.tell(ElectionTimeout.INSTANCE, ActorRef.noSender()); - String leaderPath = waitUntilLeader(followerShard); - assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); - - final YangInstanceIdentifier path = TestModel.TEST_PATH; - final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); - final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener), - actorFactory.generateActorId(testName + "-DataTreeChangeListener")); - - followerShard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); - final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), - RegisterDataTreeChangeListenerReply.class); - assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); - - writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - - listener.waitForChangeEvents(); - }}; + new ShardTestKit(getSystem()) { + { + final String testName = "testClusteredDataTreeChangeListenerRegistration"; + final ShardIdentifier followerShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config"); + + final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory", + MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config"); + + final TestActorRef followerShard = actorFactory + .createTestActor(Shard.builder().id(followerShardID) + .datastoreContext(dataStoreContextBuilder.shardElectionTimeoutFactor(1000).build()) + .peerAddresses(Collections.singletonMap(leaderShardID.toString(), + "akka://test/user/" + leaderShardID.toString())) + .schemaContext(SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), followerShardID.toString()); + + final TestActorRef leaderShard = actorFactory + .createTestActor(Shard.builder().id(leaderShardID).datastoreContext(newDatastoreContext()) + .peerAddresses(Collections.singletonMap(followerShardID.toString(), + "akka://test/user/" + followerShardID.toString())) + .schemaContext(SCHEMA_CONTEXT).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), leaderShardID.toString()); + + leaderShard.tell(TimeoutNow.INSTANCE, ActorRef.noSender()); + final String leaderPath = waitUntilLeader(followerShard); + assertEquals("Shard leader path", leaderShard.path().toString(), leaderPath); + + final YangInstanceIdentifier path = TestModel.TEST_PATH; + final MockDataTreeChangeListener listener = new MockDataTreeChangeListener(1); + final ActorRef dclActor = actorFactory.createActor(DataTreeChangeListenerActor.props(listener, path), + actorFactory.generateActorId(testName + "-DataTreeChangeListener")); + + followerShard.tell(new RegisterDataTreeChangeListener(TestModel.TEST_PATH, dclActor, true), getRef()); + final RegisterDataTreeChangeListenerReply reply = expectMsgClass(duration("5 seconds"), + RegisterDataTreeChangeListenerReply.class); + assertNotNull("getListenerRegistrationPath", reply.getListenerRegistrationPath()); + + writeToStore(followerShard, path, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + + listener.waitForChangeEvents(); + } + }; } @Test