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%2FDistributedDataStoreIntegrationTest.java;h=1cc7ae8ad02f93dd9f80135a47c1b5dfdfc2b58c;hb=b5167b9bc04f2792b275cfe0eac78c0f5eb9442d;hp=21aa00e9e0b98c60b2d117fa67f36864e0c7700a;hpb=3a8636987a20a584ad25af7aba11ffcade21ebe3;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java index 21aa00e9e0..1cc7ae8ad0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DistributedDataStoreIntegrationTest.java @@ -1,221 +1,323 @@ package org.opendaylight.controller.cluster.datastore; +import akka.actor.ActorRef; import akka.actor.ActorSystem; -import akka.event.Logging; -import akka.testkit.JavaTestKit; - +import akka.actor.PoisonPill; import com.google.common.base.Optional; -import com.google.common.util.concurrent.ListenableFuture; - -import junit.framework.Assert; - -import org.apache.commons.io.FileUtils; -import org.junit.After; -import org.junit.Before; +import com.google.common.util.concurrent.Uninterruptibles; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper; +import org.opendaylight.controller.cluster.datastore.utils.MockDataChangeListener; 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.cluster.datastore.model.TestModel; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; - -import java.io.File; -import java.io.IOException; -import java.util.concurrent.ExecutionException; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; +public class DistributedDataStoreIntegrationTest extends AbstractActorTest { -public class DistributedDataStoreIntegrationTest { + @Test + public void testWriteTransactionWithSingleShard() throws Exception{ + System.setProperty("shard.persistent", "true"); + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("transactionIntegrationTest", "test-1"); - private static ActorSystem system; + testWriteTransaction(dataStore, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - @Before - public void setUp() throws IOException { - File journal = new File("journal"); + testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); - if(journal.exists()) { - FileUtils.deleteDirectory(journal); - } + cleanup(dataStore); + }}; + } + @Test + public void testWriteTransactionWithMultipleShards() throws Exception{ + System.setProperty("shard.persistent", "true"); + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("testWriteTransactionWithMultipleShards", "cars-1", "people-1"); - System.setProperty("shard.persistent", "false"); - system = ActorSystem.create("test"); - } + DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction(); + assertNotNull("newWriteOnlyTransaction returned null", writeTx); - @After - public void tearDown() { - JavaTestKit.shutdownActorSystem(system); - system = null; - } + YangInstanceIdentifier nodePath1 = CarsModel.BASE_PATH; + NormalizedNode nodeToWrite1 = CarsModel.emptyContainer(); + writeTx.write(nodePath1, nodeToWrite1); + + YangInstanceIdentifier nodePath2 = PeopleModel.BASE_PATH; + NormalizedNode nodeToWrite2 = PeopleModel.emptyContainer(); + writeTx.write(nodePath2, nodeToWrite2); + + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); + + Boolean canCommit = cohort.canCommit().get(5, TimeUnit.SECONDS); + assertEquals("canCommit", true, canCommit); + cohort.preCommit().get(5, TimeUnit.SECONDS); + cohort.commit().get(5, TimeUnit.SECONDS); + + // 5. Verify the data in the store - protected ActorSystem getSystem() { - return system; + DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); + + Optional> optional = readTx.read(nodePath1).get(); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", nodeToWrite1, optional.get()); + + optional = readTx.read(nodePath2).get(); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", nodeToWrite2, optional.get()); + + cleanup(dataStore); + }}; } @Test - public void integrationTest() throws Exception { - final Configuration configuration = new ConfigurationImpl("module-shards.conf", "modules.conf"); - ShardStrategyFactory.setConfiguration(configuration); + public void testReadWriteTransaction() throws Exception{ + System.setProperty("shard.persistent", "true"); + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("testReadWriteTransaction", "test-1"); + // 1. Create a read-write Tx + DOMStoreReadWriteTransaction readWriteTx = dataStore.newReadWriteTransaction(); + assertNotNull("newReadWriteTransaction returned null", readWriteTx); - new JavaTestKit(getSystem()) { - { + // 2. Write some data - new Within(duration("10 seconds")) { - @Override - protected void run() { - try { - final DistributedDataStore distributedDataStore = - new DistributedDataStore(getSystem(), "config", - new MockClusterWrapper(), configuration, - new DistributedDataStoreProperties()); + YangInstanceIdentifier nodePath = TestModel.TEST_PATH; + NormalizedNode nodeToWrite = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + readWriteTx.write(nodePath, nodeToWrite ); - distributedDataStore.onGlobalContextUpdated(TestModel.createTestContext()); + // 3. Read the data from Tx - // Wait for a specific log message to show up - final boolean result = - new JavaTestKit.EventFilter(Logging.Info.class - ) { - @Override - protected Boolean run() { - return true; - } - }.from("akka://test/user/shardmanager-config/member-1-shard-test-1-config") - .message("Switching from state Candidate to Leader") - .occurrences(1).exec(); + Boolean exists = readWriteTx.exists(nodePath).checkedGet(5, TimeUnit.SECONDS); + assertEquals("exists", true, exists); - assertEquals(true, result); + Optional> optional = readWriteTx.read(nodePath).get(5, TimeUnit.SECONDS); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", nodeToWrite, optional.get()); - DOMStoreReadWriteTransaction transaction = - distributedDataStore.newReadWriteTransaction(); + // 4. Ready the Tx for commit - transaction - .write(TestModel.TEST_PATH, ImmutableNodes - .containerNode(TestModel.TEST_QNAME)); + DOMStoreThreePhaseCommitCohort cohort = readWriteTx.ready(); - ListenableFuture>> - future = - transaction.read(TestModel.TEST_PATH); + // 5. Commit the Tx - Optional> optional = - future.get(); + Boolean canCommit = cohort.canCommit().get(5, TimeUnit.SECONDS); + assertEquals("canCommit", true, canCommit); + cohort.preCommit().get(5, TimeUnit.SECONDS); + cohort.commit().get(5, TimeUnit.SECONDS); - Assert.assertTrue("Node not found", optional.isPresent()); + // 6. Verify the data in the store - NormalizedNode normalizedNode = - optional.get(); + DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); - assertEquals(TestModel.TEST_QNAME, - normalizedNode.getNodeType()); + optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", nodeToWrite, optional.get()); - DOMStoreThreePhaseCommitCohort ready = - transaction.ready(); + cleanup(dataStore); + }}; + } - ListenableFuture canCommit = - ready.canCommit(); + @Test + public void testTransactionAbort() throws Exception{ + System.setProperty("shard.persistent", "true"); + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("transactionAbortIntegrationTest", "test-1"); - assertTrue(canCommit.get(5, TimeUnit.SECONDS)); + DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction(); + assertNotNull("newWriteOnlyTransaction returned null", writeTx); - ListenableFuture preCommit = - ready.preCommit(); + writeTx.write(TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - preCommit.get(5, TimeUnit.SECONDS); + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); - ListenableFuture commit = ready.commit(); + cohort.canCommit().get(5, TimeUnit.SECONDS); - commit.get(5, TimeUnit.SECONDS); - } catch (ExecutionException | TimeoutException | InterruptedException e){ - fail(e.getMessage()); - } - } - }; - } - }; + cohort.abort().get(5, TimeUnit.SECONDS); + testWriteTransaction(dataStore, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + + cleanup(dataStore); + }}; } + @Test + public void testTransactionChain() throws Exception{ + System.setProperty("shard.persistent", "true"); + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("transactionChainIntegrationTest", "test-1"); + + // 1. Create a Tx chain and write-only Tx + + DOMStoreTransactionChain txChain = dataStore.createTransactionChain(); - //FIXME : Disabling test because it's flaky - //@Test - public void integrationTestWithMultiShardConfiguration() - throws ExecutionException, InterruptedException, TimeoutException { - final Configuration configuration = new ConfigurationImpl("module-shards.conf", "modules.conf"); + DOMStoreWriteTransaction writeTx = txChain.newWriteOnlyTransaction(); + assertNotNull("newWriteOnlyTransaction returned null", writeTx); - ShardStrategyFactory.setConfiguration(configuration); + // 2. Write some data - new JavaTestKit(getSystem()) { - { + NormalizedNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME); + writeTx.write(TestModel.TEST_PATH, containerNode); - new Within(duration("10 seconds")) { - @Override - protected void run() { - try { - final DistributedDataStore distributedDataStore = - new DistributedDataStore(getSystem(), "config", - new MockClusterWrapper(), configuration, null); + // 3. Ready the Tx for commit - distributedDataStore.onGlobalContextUpdated( - SchemaContextHelper.full()); + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); - // Wait for a specific log message to show up - final boolean result = - new JavaTestKit.EventFilter( - Logging.Info.class - ) { - @Override - protected Boolean run() { - return true; - } - }.from( - "akka://test/user/shardmanager-config/member-1-shard-cars-1-config") - .message( - "Switching from state Candidate to Leader") - .occurrences(1) - .exec(); + // 4. Commit the Tx - Thread.sleep(1000); + Boolean canCommit = cohort.canCommit().get(5, TimeUnit.SECONDS); + assertEquals("canCommit", true, canCommit); + cohort.preCommit().get(5, TimeUnit.SECONDS); + cohort.commit().get(5, TimeUnit.SECONDS); + // 5. Verify the data in the store - DOMStoreReadWriteTransaction transaction = - distributedDataStore.newReadWriteTransaction(); + DOMStoreReadTransaction readTx = txChain.newReadOnlyTransaction(); - transaction.write(CarsModel.BASE_PATH, CarsModel.emptyContainer()); - transaction.write(PeopleModel.BASE_PATH, PeopleModel.emptyContainer()); + Optional> optional = readTx.read(TestModel.TEST_PATH).get(5, TimeUnit.SECONDS); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", containerNode, optional.get()); - DOMStoreThreePhaseCommitCohort ready = transaction.ready(); + txChain.close(); - ListenableFuture canCommit = ready.canCommit(); + cleanup(dataStore); + }}; + } + + @Test + public void testChangeListenerRegistration() throws Exception{ + new IntegrationTestKit(getSystem()) {{ + DistributedDataStore dataStore = + setupDistributedDataStore("testChangeListenerRegistration", "test-1"); - assertTrue(canCommit.get(5, TimeUnit.SECONDS)); + MockDataChangeListener listener = new MockDataChangeListener(3); - ListenableFuture preCommit = ready.preCommit(); + ListenerRegistration + listenerReg = dataStore.registerChangeListener(TestModel.TEST_PATH, listener, + DataChangeScope.SUBTREE); - preCommit.get(5, TimeUnit.SECONDS); + assertNotNull("registerChangeListener returned null", listenerReg); - ListenableFuture commit = ready.commit(); + testWriteTransaction(dataStore, TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); - commit.get(5, TimeUnit.SECONDS); + testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH, + ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build()); - assertEquals(true, result); - } catch(ExecutionException | TimeoutException | InterruptedException e){ - fail(e.getMessage()); - } + YangInstanceIdentifier listPath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH). + nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1).build(); + testWriteTransaction(dataStore, listPath, + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 1)); + + listener.waitForChangeEvents(TestModel.TEST_PATH, TestModel.OUTER_LIST_PATH, listPath ); + + listenerReg.close(); + + testWriteTransaction(dataStore, YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH). + nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build(), + ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2)); + + listener.expectNoMoreChanges("Received unexpected change after close"); + + cleanup(dataStore); + }}; + } + + class IntegrationTestKit extends ShardTestKit { + + IntegrationTestKit(ActorSystem actorSystem) { + super(actorSystem); + } + + DistributedDataStore setupDistributedDataStore(String typeName, String... shardNames) { + MockClusterWrapper cluster = new MockClusterWrapper(); + Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf"); + ShardStrategyFactory.setConfiguration(config); + + DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); + DistributedDataStore dataStore = new DistributedDataStore(getSystem(), typeName, cluster, + config, datastoreContext); + + SchemaContext schemaContext = SchemaContextHelper.full(); + dataStore.onGlobalContextUpdated(schemaContext); + + for(String shardName: shardNames) { + ActorRef shard = null; + for(int i = 0; i < 20 * 5 && shard == null; i++) { + Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); + Optional shardReply = dataStore.getActorContext().findLocalShard(shardName); + if(shardReply.isPresent()) { + shard = shardReply.get(); } - }; + } + + assertNotNull("Shard was not created", shard); + + System.out.println("!!!!!!shard: "+shard.path().toString()); + waitUntilLeader(shard); } - }; + return dataStore; + } + + void testWriteTransaction(DistributedDataStore dataStore, YangInstanceIdentifier nodePath, + NormalizedNode nodeToWrite) throws Exception { + // 1. Create a write-only Tx + + DOMStoreWriteTransaction writeTx = dataStore.newWriteOnlyTransaction(); + assertNotNull("newWriteOnlyTransaction returned null", writeTx); + + // 2. Write some data + + writeTx.write(nodePath, nodeToWrite); + + // 3. Ready the Tx for commit + + DOMStoreThreePhaseCommitCohort cohort = writeTx.ready(); + + // 4. Commit the Tx + + Boolean canCommit = cohort.canCommit().get(5, TimeUnit.SECONDS); + assertEquals("canCommit", true, canCommit); + cohort.preCommit().get(5, TimeUnit.SECONDS); + cohort.commit().get(5, TimeUnit.SECONDS); + + // 5. Verify the data in the store + + DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); + + Optional> optional = readTx.read(nodePath).get(5, TimeUnit.SECONDS); + assertEquals("isPresent", true, optional.isPresent()); + assertEquals("Data node", nodeToWrite, optional.get()); + } + + void cleanup(DistributedDataStore dataStore) { + dataStore.getActorContext().getShardManager().tell(PoisonPill.getInstance(), null); + } } }