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%2FShardTransactionTest.java;h=8ce8f4d4b548be7080ac1d57ec158da5eeecb629;hb=6efadbe88c9ef60ca884c586fa4652ff0102cadf;hp=3f31591c79c4f7d3aa6dff45f518c2f8d38726e0;hpb=e6bce2425d5d3f477bed1fff0ac2b2eb70cbe131;p=controller.git 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 3f31591c79..8ce8f4d4b5 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 @@ -5,10 +5,8 @@ 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 org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException; @@ -35,16 +33,12 @@ import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; 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.assertTrue; @@ -61,7 +55,7 @@ public class ShardTransactionTest extends AbstractActorTest { ShardIdentifier.builder().memberName("member-1") .shardName("inventory").type("config").build(); - private DatastoreContext datastoreContext = new DatastoreContext(); + private DatastoreContext datastoreContext = DatastoreContext.newBuilder().build(); private final ShardStats shardStats = new ShardStats(SHARD_IDENTIFIER.toString(), "DataStore"); @@ -72,7 +66,7 @@ public class ShardTransactionTest extends AbstractActorTest { private ActorRef createShard(){ return getSystem().actorOf(Shard.props(SHARD_IDENTIFIER, - Collections.EMPTY_MAP, new DatastoreContext(), TestModel.createTestContext())); + Collections.EMPTY_MAP, datastoreContext, TestModel.createTestContext())); } @Test @@ -80,7 +74,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testReadData"); new Within(duration("1 seconds")) { @@ -122,7 +116,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testReadDataWhenDataNotFound"); new Within(duration("1 seconds")) { @@ -165,7 +159,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testDataExistsPositive"); new Within(duration("1 seconds")) { @@ -207,7 +201,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testDataExistsNegative"); new Within(duration("1 seconds")) { @@ -247,20 +241,20 @@ public class ShardTransactionTest extends AbstractActorTest { private void assertModification(final ActorRef subject, final Class modificationType) { new JavaTestKit(getSystem()) {{ - new Within(duration("1 seconds")) { + new Within(duration("3 seconds")) { @Override protected void run() { subject - .tell(new ShardTransaction.GetCompositedModification(), + .tell(new ShardWriteTransaction.GetCompositedModification(), getRef()); final CompositeModification compositeModification = - new ExpectMsg(duration("1 seconds"), "match hint") { + new ExpectMsg(duration("3 seconds"), "match hint") { // do not put code outside this method, will run afterwards @Override protected CompositeModification match(Object in) { - if (in instanceof ShardTransaction.GetCompositeModificationReply) { - return ((ShardTransaction.GetCompositeModificationReply) in) + if (in instanceof ShardWriteTransaction.GetCompositeModificationReply) { + return ((ShardWriteTransaction.GetCompositeModificationReply) in) .getModification(); } else { throw noMatch(); @@ -284,7 +278,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testWriteData"); @@ -324,7 +318,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testMergeData"); @@ -365,7 +359,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newWriteOnlyTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testDeleteData"); @@ -404,7 +398,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props( store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testReadyTransaction"); @@ -442,7 +436,7 @@ public class ShardTransactionTest extends AbstractActorTest { new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testCloseTransaction"); @@ -492,7 +486,7 @@ 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); + testSchemaContext, datastoreContext, shardStats, "txn"); final TestActorRef subject = TestActorRef.apply(props,getSystem()); subject.receive(new DeleteData(TestModel.TEST_PATH).toSerializable(), ActorRef.noSender()); @@ -501,14 +495,13 @@ public class ShardTransactionTest extends AbstractActorTest { @Test public void testShardTransactionInactivity() { - datastoreContext = new DatastoreContext("Test", - InMemoryDOMDataStoreConfigProperties.getDefault(), - Duration.create(500, TimeUnit.MILLISECONDS), 5, 1000, 1000, 500); + datastoreContext = DatastoreContext.newBuilder().shardTransactionIdleTimeout( + Duration.create(500, TimeUnit.MILLISECONDS)).build(); new JavaTestKit(getSystem()) {{ final ActorRef shard = createShard(); final Props props = ShardTransaction.props(store.newReadWriteTransaction(), shard, - testSchemaContext, datastoreContext, shardStats); + testSchemaContext, datastoreContext, shardStats, "txn"); final ActorRef subject = getSystem().actorOf(props, "testShardTransactionInactivity");