X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardDataTreeTest.java;h=814f90711d43387ee4219bc2c4811ab21ece497d;hb=refs%2Fchanges%2F33%2F78433%2F4;hp=6f0b32b4506ebce3f3886fe227cfc5afbdf231a9;hpb=29aa3b83db308b1a511857db8d918e0f2e629407;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 6f0b32b450..814f90711d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -10,10 +10,11 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyBoolean; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -29,9 +30,9 @@ import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediate3PhaseCommit; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCanCommit; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCommit; +import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePayloadReplication; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePreCommit; -import com.google.common.base.Optional; import com.google.common.base.Ticker; import com.google.common.collect.Maps; import com.google.common.primitives.UnsignedLong; @@ -41,7 +42,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutionException; +import java.util.Optional; import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; @@ -53,7 +54,7 @@ import org.opendaylight.controller.cluster.datastore.persisted.CommitTransaction import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -66,6 +67,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class ShardDataTreeTest extends AbstractTest { + private static final DatastoreContext DATASTORE_CONTEXT = DatastoreContext.newBuilder().build(); private final Shard mockShard = Mockito.mock(Shard.class); private ShardDataTree shardDataTree; @@ -73,9 +75,9 @@ public class ShardDataTreeTest extends AbstractTest { @Before public void setUp() { - doReturn(true).when(mockShard).canSkipPayload(); doReturn(Ticker.systemTicker()).when(mockShard).ticker(); - doReturn(Mockito.mock(ShardStats.class)).when(mockShard).getShardMBean(); + doReturn(mock(ShardStats.class)).when(mockShard).getShardMBean(); + doReturn(DATASTORE_CONTEXT).when(mockShard).getDatastoreContext(); fullSchema = SchemaContextHelper.full(); @@ -83,17 +85,17 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void testWrite() throws ExecutionException, InterruptedException { + public void testWrite() { modify(false, true, true); } @Test - public void testMerge() throws ExecutionException, InterruptedException { + public void testMerge() { modify(true, true, true); } - private void modify(final boolean merge, final boolean expectedCarsPresent, final boolean expectedPeoplePresent) - throws ExecutionException, InterruptedException { + private void modify(final boolean merge, final boolean expectedCarsPresent, final boolean expectedPeoplePresent) { + immediatePayloadReplication(shardDataTree, mockShard); assertEquals(fullSchema, shardDataTree.getSchemaContext()); @@ -112,7 +114,7 @@ public class ShardDataTreeTest extends AbstractTest { snapshot.write(PeopleModel.BASE_PATH, PeopleModel.create()); } - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort); @@ -133,7 +135,9 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarOnce() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarOnce() { + immediatePayloadReplication(shardDataTree, mockShard); + final List candidates = new ArrayList<>(); candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); @@ -148,7 +152,9 @@ public class ShardDataTreeTest extends AbstractTest { } @Test - public void bug4359AddRemoveCarTwice() throws ExecutionException, InterruptedException { + public void bug4359AddRemoveCarTwice() { + immediatePayloadReplication(shardDataTree, mockShard); + final List candidates = new ArrayList<>(); candidates.add(addCar(shardDataTree)); candidates.add(removeCar(shardDataTree)); @@ -166,8 +172,11 @@ public class ShardDataTreeTest extends AbstractTest { @Test public void testListenerNotifiedOnApplySnapshot() throws Exception { + immediatePayloadReplication(shardDataTree, mockShard); + DOMDataTreeChangeListener listener = mock(DOMDataTreeChangeListener.class); - shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener); + shardDataTree.registerTreeChangeListener(CarsModel.CAR_LIST_PATH.node(CarsModel.CAR_QNAME), listener, + com.google.common.base.Optional.absent(), noop -> { }); addCar(shardDataTree, "optima"); @@ -184,6 +193,7 @@ public class ShardDataTreeTest extends AbstractTest { }); ShardDataTree newDataTree = new ShardDataTree(mockShard, fullSchema, TreeType.OPERATIONAL); + immediatePayloadReplication(newDataTree, mockShard); addCar(newDataTree, "optima"); addCar(newDataTree, "murano"); @@ -206,8 +216,6 @@ public class ShardDataTreeTest extends AbstractTest { @Test public void testPipelinedTransactionsWithCoordinatedCommits() throws Exception { - doReturn(false).when(mockShard).canSkipPayload(); - final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); @@ -293,18 +301,16 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertEquals("People node present", true, optional.isPresent()); + assertTrue("People node present", optional.isPresent()); assertEquals("People node", peopleNode, optional.get()); } @Test public void testPipelinedTransactionsWithImmediateCommits() throws Exception { - doReturn(false).when(mockShard).canSkipPayload(); - final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); @@ -342,15 +348,41 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } + @Test + public void testPipelinedTransactionsWithImmediateReplication() { + immediatePayloadReplication(shardDataTree, mockShard); + + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); + + final ShardDataTreeCohort cohort2 = newShardDataTreeCohort(snapshot -> + snapshot.write(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode())); + + YangInstanceIdentifier carPath = CarsModel.newCarPath("optima"); + MapEntryNode carNode = CarsModel.newCarEntry("optima", new BigInteger("100")); + final ShardDataTreeCohort cohort3 = newShardDataTreeCohort(snapshot -> snapshot.write(carPath, carNode)); + + final FutureCallback commitCallback1 = immediate3PhaseCommit(cohort1); + final FutureCallback commitCallback2 = immediate3PhaseCommit(cohort2); + final FutureCallback commitCallback3 = immediate3PhaseCommit(cohort3); + + InOrder inOrder = inOrder(commitCallback1, commitCallback2, commitCallback3); + inOrder.verify(commitCallback1).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback2).onSuccess(any(UnsignedLong.class)); + inOrder.verify(commitCallback3).onSuccess(any(UnsignedLong.class)); + + final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + Optional> optional = snapshot.readNode(CarsModel.BASE_PATH); + assertTrue("Car node present", optional.isPresent()); + } + @SuppressWarnings("unchecked") @Test public void testAbortWithPendingCommits() throws Exception { - doReturn(false).when(mockShard).canSkipPayload(); - final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); @@ -401,13 +433,15 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(carPath); - assertEquals("Car node present", true, optional.isPresent()); + assertTrue("Car node present", optional.isPresent()); assertEquals("Car node", carNode, optional.get()); } @SuppressWarnings("unchecked") @Test - public void testAbortWithFailedRebase() throws Exception { + public void testAbortWithFailedRebase() { + immediatePayloadReplication(shardDataTree, mockShard); + final ShardDataTreeCohort cohort1 = newShardDataTreeCohort(snapshot -> snapshot.write(CarsModel.BASE_PATH, CarsModel.emptyContainer())); @@ -439,7 +473,7 @@ public class ShardDataTreeTest extends AbstractTest { final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); Optional> optional = snapshot.readNode(PeopleModel.BASE_PATH); - assertEquals("People node present", true, optional.isPresent()); + assertTrue("People node present", optional.isPresent()); assertEquals("People node", peopleNode, optional.get()); } @@ -448,7 +482,7 @@ public class ShardDataTreeTest extends AbstractTest { shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); operation.execute(snapshot); - return shardDataTree.finishTransaction(transaction); + return shardDataTree.finishTransaction(transaction, Optional.empty()); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -472,18 +506,16 @@ public class ShardDataTreeTest extends AbstractTest { final Optional> optional = snapshot1.readNode(CarsModel.BASE_PATH); - assertEquals(true, optional.isPresent()); + assertTrue(optional.isPresent()); return optional.get(); } - private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree) { return addCar(shardDataTree, "altima"); } - private static DataTreeCandidate addCar(final ShardDataTree shardDataTree, final String name) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate addCar(final ShardDataTree shardDataTree, final String name) { return doTransaction(shardDataTree, snapshot -> { snapshot.merge(CarsModel.BASE_PATH, CarsModel.emptyContainer()); snapshot.merge(CarsModel.CAR_LIST_PATH, CarsModel.newCarMapNode()); @@ -491,8 +523,7 @@ public class ShardDataTreeTest extends AbstractTest { }); } - private static DataTreeCandidate removeCar(final ShardDataTree shardDataTree) - throws ExecutionException, InterruptedException { + private static DataTreeCandidate removeCar(final ShardDataTree shardDataTree) { return doTransaction(shardDataTree, snapshot -> snapshot.delete(CarsModel.newCarPath("altima"))); } @@ -502,12 +533,12 @@ public class ShardDataTreeTest extends AbstractTest { } private static DataTreeCandidate doTransaction(final ShardDataTree shardDataTree, - final DataTreeOperation operation) throws ExecutionException, InterruptedException { + final DataTreeOperation operation) { final ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); operation.execute(snapshot); - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort); @@ -518,14 +549,14 @@ public class ShardDataTreeTest extends AbstractTest { } private static DataTreeCandidate applyCandidates(final ShardDataTree shardDataTree, - final List candidates) throws ExecutionException, InterruptedException { + final List candidates) { final ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction(nextTransactionId()); final DataTreeModification snapshot = transaction.getSnapshot(); for (final DataTreeCandidate candidateTip : candidates) { DataTreeCandidates.applyToModification(snapshot, candidateTip); } - final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction); + final ShardDataTreeCohort cohort = shardDataTree.finishTransaction(transaction, Optional.empty()); immediateCanCommit(cohort); immediatePreCommit(cohort);