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%2FShardTransactionTest.java;h=79480ce5926dbce0be66580eb602ed8592c30bc0;hp=711f3d7a72a16b615224246e07e3adb750b7cff6;hb=3f153e5fa694fe4147e72e615edbb5c263e5a394;hpb=c36bb2bc93ea0fbdd3ca8b2663447fc921450aee diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java index 711f3d7a72..79480ce592 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardTransactionTest.java @@ -1,12 +1,17 @@ package org.opendaylight.controller.cluster.datastore; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import akka.actor.ActorRef; import akka.actor.Props; import akka.actor.Terminated; import akka.testkit.JavaTestKit; import akka.testkit.TestActorRef; -import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +import java.util.Collections; +import java.util.concurrent.TimeUnit; import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.ShardWriteTransaction.GetCompositeModificationReply; @@ -32,6 +37,8 @@ import org.opendaylight.controller.cluster.datastore.modification.DeleteModifica import org.opendaylight.controller.cluster.datastore.modification.MergeModification; import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; +import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec; +import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec.Encoded; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages; @@ -39,19 +46,10 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import scala.concurrent.duration.Duration; -import java.util.Collections; -import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; public class ShardTransactionTest extends AbstractActorTest { - private static ListeningExecutorService storeExecutor = - MoreExecutors.listeningDecorator(MoreExecutors.sameThreadExecutor()); - private static final InMemoryDOMDataStore store = - new InMemoryDOMDataStore("OPER", storeExecutor, MoreExecutors.sameThreadExecutor()); + new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); private static final SchemaContext testSchemaContext = TestModel.createTestContext(); @@ -70,7 +68,7 @@ public class ShardTransactionTest extends AbstractActorTest { private ActorRef createShard(){ return getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, - Collections.EMPTY_MAP, datastoreContext, TestModel.createTestContext())); + Collections.emptyMap(), datastoreContext, TestModel.createTestContext())); } @Test @@ -78,30 +76,30 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRO")); props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveReadData(getSystem().actorOf(props, "testReadDataRW")); } - private void testOnReceiveReadData(final ActorRef subject) { + private void testOnReceiveReadData(final ActorRef transaction) { //serialized read - subject.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), getRef()); - ShardTransactionMessages.ReadDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); + Object replySerialized = + expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - assertNotNull(ReadDataReply.fromSerializable( - testSchemaContext,YangInstanceIdentifier.builder().build(), replySerialized) - .getNormalizedNode()); + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); // unserialized read - subject.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -114,30 +112,31 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); Props props = ShardTransaction.props( store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( props, "testReadDataWhenDataNotFoundRO")); props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveReadDataWhenDataNotFound(getSystem().actorOf( props, "testReadDataWhenDataNotFoundRW")); } - private void testOnReceiveReadDataWhenDataNotFound(final ActorRef subject) { + private void testOnReceiveReadDataWhenDataNotFound(final ActorRef transaction) { // serialized read - subject.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH).toSerializable(), getRef()); - ShardTransactionMessages.ReadDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); + Object replySerialized = + expectMsgClass(duration("5 seconds"), ReadDataReply.SERIALIZABLE_CLASS); - assertTrue(ReadDataReply.fromSerializable( - testSchemaContext, TestModel.TEST_PATH, replySerialized).getNormalizedNode() == null); + assertTrue(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode() == null); // unserialized read - subject.tell(new ReadData(TestModel.TEST_PATH),getRef()); + transaction.tell(new ReadData(TestModel.TEST_PATH),getRef()); ReadDataReply reply = expectMsgClass(duration("5 seconds"), ReadDataReply.class); @@ -145,23 +144,45 @@ public class ShardTransactionTest extends AbstractActorTest { }}; } + @Test + public void testOnReceiveReadDataHeliumR1() throws Exception { + new JavaTestKit(getSystem()) {{ + final ActorRef shard = createShard(); + Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.HELIUM_1_VERSION); + + ActorRef transaction = getSystem().actorOf(props, "testOnReceiveReadDataHeliumR1"); + + transaction.tell(new ReadData(YangInstanceIdentifier.builder().build()).toSerializable(), + getRef()); + + ShardTransactionMessages.ReadDataReply replySerialized = + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.ReadDataReply.class); + + assertNotNull(ReadDataReply.fromSerializable(replySerialized).getNormalizedNode()); + }}; + } + @Test public void testOnReceiveDataExistsPositive() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRO")); props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveDataExistsPositive(getSystem().actorOf(props, "testDataExistsPositiveRW")); } - private void testOnReceiveDataExistsPositive(final ActorRef subject) { - subject.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), + private void testOnReceiveDataExistsPositive(final ActorRef transaction) { + transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()).toSerializable(), getRef()); ShardTransactionMessages.DataExistsReply replySerialized = @@ -170,7 +191,7 @@ public class ShardTransactionTest extends AbstractActorTest { assertTrue(DataExistsReply.fromSerializable(replySerialized).exists()); // unserialized read - subject.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); + transaction.tell(new DataExists(YangInstanceIdentifier.builder().build()),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -183,18 +204,20 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRO")); props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); testOnReceiveDataExistsNegative(getSystem().actorOf(props, "testDataExistsNegativeRW")); } - private void testOnReceiveDataExistsNegative(final ActorRef subject) { - subject.tell(new DataExists(TestModel.TEST_PATH).toSerializable(), getRef()); + private void testOnReceiveDataExistsNegative(final ActorRef transaction) { + transaction.tell(new DataExists(TestModel.TEST_PATH).toSerializable(), getRef()); ShardTransactionMessages.DataExistsReply replySerialized = expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DataExistsReply.class); @@ -202,7 +225,7 @@ public class ShardTransactionTest extends AbstractActorTest { assertFalse(DataExistsReply.fromSerializable(replySerialized).exists()); // unserialized read - subject.tell(new DataExists(TestModel.TEST_PATH),getRef()); + transaction.tell(new DataExists(TestModel.TEST_PATH),getRef()); DataExistsReply reply = expectMsgClass(duration("5 seconds"), DataExistsReply.class); @@ -228,74 +251,116 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testWriteData"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveWriteData"); - subject.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), TestModel.createTestContext()).toSerializable(), - getRef()); + transaction.tell(new WriteData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( + DataStoreVersions.HELIUM_2_VERSION), getRef()); - ShardTransactionMessages.WriteDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); - assertModification(subject, WriteModification.class); + assertModification(transaction, WriteModification.class); - //unserialized write - subject.tell(new WriteData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), - TestModel.createTestContext()), + // unserialized write + transaction.tell(new WriteData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)), getRef()); expectMsgClass(duration("5 seconds"), WriteDataReply.class); }}; } + @Test + public void testOnReceiveHeliumR1WriteData() throws Exception { + new JavaTestKit(getSystem()) {{ + final ActorRef shard = createShard(); + final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.HELIUM_1_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveHeliumR1WriteData"); + + Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + ShardTransactionMessages.WriteData serialized = ShardTransactionMessages.WriteData.newBuilder() + .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) + .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); + + transaction.tell(serialized, getRef()); + + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.WriteDataReply.class); + + assertModification(transaction, WriteModification.class); + }}; + } + @Test public void testOnReceiveMergeData() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testMergeData"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testMergeData"); - subject.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), testSchemaContext).toSerializable(), - getRef()); + transaction.tell(new MergeData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)).toSerializable( + DataStoreVersions.HELIUM_2_VERSION), getRef()); - ShardTransactionMessages.MergeDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); - assertModification(subject, MergeModification.class); + assertModification(transaction, MergeModification.class); //unserialized merge - subject.tell(new MergeData(TestModel.TEST_PATH, - ImmutableNodes.containerNode(TestModel.TEST_QNAME), testSchemaContext), + transaction.tell(new MergeData(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)), getRef()); expectMsgClass(duration("5 seconds"), MergeDataReply.class); }}; } + @Test + public void testOnReceiveHeliumR1MergeData() throws Exception { + new JavaTestKit(getSystem()) {{ + final ActorRef shard = createShard(); + final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.HELIUM_1_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testOnReceiveHeliumR1MergeData"); + + Encoded encoded = new NormalizedNodeToNodeCodec(null).encode(TestModel.TEST_PATH, + ImmutableNodes.containerNode(TestModel.TEST_QNAME)); + ShardTransactionMessages.MergeData serialized = ShardTransactionMessages.MergeData.newBuilder() + .setInstanceIdentifierPathArguments(encoded.getEncodedPath()) + .setNormalizedNode(encoded.getEncodedNode().getNormalizedNode()).build(); + + transaction.tell(serialized, getRef()); + + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.MergeDataReply.class); + + assertModification(transaction, MergeModification.class); + }}; + } + @Test public void testOnReceiveDeleteData() throws Exception { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testDeleteData"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testDeleteData"); - subject.tell(new DeleteData(TestModel.TEST_PATH).toSerializable(), getRef()); + transaction.tell(new DeleteData(TestModel.TEST_PATH).toSerializable(), getRef()); - ShardTransactionMessages.DeleteDataReply replySerialized = - expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); + expectMsgClass(duration("5 seconds"), ShardTransactionMessages.DeleteDataReply.class); - assertModification(subject, DeleteModification.class); + assertModification(transaction, DeleteModification.class); //unserialized merge - subject.tell(new DeleteData(TestModel.TEST_PATH), getRef()); + transaction.tell(new DeleteData(TestModel.TEST_PATH), getRef()); expectMsgClass(duration("5 seconds"), DeleteDataReply.class); }}; @@ -307,26 +372,36 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testReadyTransaction"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testReadyTransaction"); + + watch(transaction); - subject.tell(new ReadyTransaction().toSerializable(), getRef()); + transaction.tell(new ReadyTransaction().toSerializable(), getRef()); - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS); + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS, + Terminated.class); + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.SERIALIZABLE_CLASS, + Terminated.class); }}; // test new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = - getSystem().actorOf(props, "testReadyTransaction2"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testReadyTransaction2"); - subject.tell(new ReadyTransaction(), getRef()); + watch(transaction); - expectMsgClass(duration("5 seconds"), ReadyTransactionReply.class); + transaction.tell(new ReadyTransaction(), getRef()); + + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.class, + Terminated.class); + expectMsgAnyClassOf(duration("5 seconds"), ReadyTransactionReply.class, + Terminated.class); }}; } @@ -337,15 +412,16 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = getSystem().actorOf(props, "testCloseTransaction"); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testCloseTransaction"); - watch(subject); + watch(transaction); - subject.tell(new CloseTransaction().toSerializable(), getRef()); + transaction.tell(new CloseTransaction().toSerializable(), getRef()); expectMsgClass(duration("3 seconds"), CloseTransactionReply.SERIALIZABLE_CLASS); - expectMsgClass(duration("3 seconds"), Terminated.class); + expectTerminated(duration("3 seconds"), transaction); }}; } @@ -353,10 +429,11 @@ public class ShardTransactionTest extends AbstractActorTest { public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception { final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final TestActorRef subject = TestActorRef.apply(props,getSystem()); + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final TestActorRef transaction = TestActorRef.apply(props,getSystem()); - subject.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender()); + transaction.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender()); } @Test @@ -368,27 +445,14 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats, "txn"); - final ActorRef subject = + testSchemaContext, datastoreContext, shardStats, "txn", + DataStoreVersions.CURRENT_VERSION); + final ActorRef transaction = getSystem().actorOf(props, "testShardTransactionInactivity"); - watch(subject); + watch(transaction); - // The shard Tx actor should receive a ReceiveTimeout message and self-destruct. - - final String termination = new ExpectMsg(duration("3 seconds"), "match hint") { - // do not put code outside this method, will run afterwards - @Override - protected String match(Object in) { - if (in instanceof Terminated) { - return "match"; - } else { - throw noMatch(); - } - } - }.get(); // this extracts the received message - - assertEquals("match", termination); + expectMsgClass(duration("3 seconds"), Terminated.class); }}; } }