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%2Fshardmanager%2FShardManagerTest.java;h=5efd0947026d6cc51aa9d59bb1cb2ef3b5ef57d4;hb=4d15b2022b97238fa9da4df4239f88c619b2e264;hp=6a8830c25b2d213bf105decd8e170c306e37d2d9;hpb=149feb98f151186975fe42bab5853e05aafd4b51;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 6a8830c25b..5efd094702 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -44,7 +44,6 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; -import com.typesafe.config.ConfigFactory; import java.net.URI; import java.util.AbstractMap; import java.util.Arrays; @@ -139,18 +138,16 @@ public class ShardManagerTest extends AbstractShardManagerTest { private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); private ActorSystem newActorSystem(String config) { - ActorSystem system = ActorSystem.create("cluster-test", ConfigFactory.load().getConfig(config)); - actorSystems.add(system); - return system; + return newActorSystem("cluster-test", config); } private ActorRef newMockShardActor(ActorSystem system, String shardName, String memberName) { String name = ShardIdentifier.create(shardName, MemberName.forName(memberName), "config").toString(); if (system == getSystem()) { - return actorFactory.createTestActor(Props.create(MessageCollectorActor.class), name); + return actorFactory.createActor(Props.create(MessageCollectorActor.class), name); } - return TestActorRef.create(system, Props.create(MessageCollectorActor.class), name); + return system.actorOf(Props.create(MessageCollectorActor.class), name); } private Props newShardMgrProps() { @@ -180,7 +177,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { } private Props newPropsShardMgrWithMockShardActor(ActorRef shardActor) { - return newTestShardMgrBuilderWithMockShardActor(shardActor).props(); + return newTestShardMgrBuilderWithMockShardActor(shardActor).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()); } @@ -249,9 +247,9 @@ public class ShardManagerTest extends AbstractShardManagerTest { } }; - final TestActorRef defaultShardActor = actorFactory.createTestActor( + final ActorRef defaultShardActor = actorFactory.createActor( Props.create(MessageCollectorActor.class), actorFactory.generateActorId("default")); - final TestActorRef topologyShardActor = actorFactory.createTestActor( + final ActorRef topologyShardActor = actorFactory.createActor( Props.create(MessageCollectorActor.class), actorFactory.generateActorId("topology")); final Map> shardInfoMap = Collections.synchronizedMap( @@ -1215,7 +1213,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true); ActorRef shardManager = actorFactory - .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))); + .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) + .withDispatcher(Dispatchers.DefaultDispatcherId())); SchemaContext schemaContext = TestModel.createTestContext(); shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender()); @@ -1266,7 +1265,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreContextBuilder.shardInitializationTimeout(1, TimeUnit.MINUTES).persistent(true); ActorRef shardManager = actorFactory - .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))); + .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) + .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), ActorRef.noSender()); @@ -1295,7 +1295,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new JavaTestKit(getSystem()) { { ActorRef shardManager = actorFactory - .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))); + .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) + .withDispatcher(Dispatchers.DefaultDispatcherId())); Shard.Builder shardBuilder = Shard.builder(); @@ -1329,8 +1330,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")) .put("astronauts", Collections.emptyList()).build()); - TestActorRef shardManager = actorFactory - .createTestActor(newShardMgrProps(mockConfig).withDispatcher(Dispatchers.DefaultDispatcherId())); + TestActorRef shardManager = actorFactory.createTestActor(newShardMgrProps(mockConfig) + .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(GetSnapshot.INSTANCE, kit.getRef()); Failure failure = kit.expectMsgClass(Failure.class); @@ -1427,7 +1428,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new JavaTestKit(getSystem()) { { ActorRef shardManager = actorFactory - .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))); + .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) + .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new AddShardReplica("model-inventory"), getRef()); Status.Failure resp = expectMsgClass(duration("2 seconds"), Status.Failure.class); @@ -1626,7 +1628,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef mockNewReplicaShardActor = newMockShardActor(getSystem(), "astronauts", "member-1"); final TestActorRef shardManager = actorFactory.createTestActor( - newTestShardMgrBuilder(mockConfig).shardActor(mockNewReplicaShardActor).props(), shardMgrID); + newTestShardMgrBuilder(mockConfig).shardActor(mockNewReplicaShardActor).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), shardMgrID); shardManager.underlyingActor() .setMessageInterceptor(newFindPrimaryInterceptor(mockShardLeaderKit.getRef())); @@ -1677,7 +1680,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("astronauts", Arrays.asList("member-2")).build()); final ActorRef newReplicaShardManager = actorFactory - .createActor(newTestShardMgrBuilder(mockConfig).shardActor(mockShardActor).props(), shardMgrID); + .createActor(newTestShardMgrBuilder(mockConfig).shardActor(mockShardActor).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()), shardMgrID); newReplicaShardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); MockClusterWrapper.sendMemberUp(newReplicaShardManager, "member-2", @@ -1697,7 +1701,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { new JavaTestKit(getSystem()) { { ActorRef shardManager = actorFactory - .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))); + .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) + .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new RemoveShardReplica("model-inventory", MEMBER_1), getRef()); Status.Failure resp = expectMsgClass(duration("10 seconds"), Status.Failure.class); @@ -1715,9 +1720,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - final TestActorRef respondActor = actorFactory - .createTestActor(Props.create(MockRespondActor.class, RemoveServer.class, - new RemoveServerReply(ServerChangeStatus.OK, null)), memberId); + final ActorRef respondActor = actorFactory.createActor(Props.create(MockRespondActor.class, + RemoveServer.class, new RemoveServerReply(ServerChangeStatus.OK, null)), memberId); ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); @@ -1886,8 +1890,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("astronauts", Arrays.asList("member-2")) .put("people", Arrays.asList("member-1", "member-2")).build()); - TestActorRef shardManager = actorFactory - .createTestActor(newShardMgrProps(mockConfig)); + TestActorRef shardManager = actorFactory.createTestActor( + newShardMgrProps(mockConfig).withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.underlyingActor().waitForRecoveryComplete(); shardManager.tell(new FindLocalShard("people", false), getRef()); @@ -1920,11 +1924,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("people", Arrays.asList("member-1", "member-2")).build()); String shardId = ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(); - TestActorRef shard = actorFactory.createTestActor(MessageCollectorActor.props(), - shardId); + ActorRef shard = actorFactory.createActor(MessageCollectorActor.props(), shardId); TestActorRef shardManager = actorFactory - .createTestActor(newTestShardMgrBuilder(mockConfig).addShardActor("default", shard).props()); + .createTestActor(newTestShardMgrBuilder(mockConfig).addShardActor("default", shard).props() + .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.underlyingActor().waitForRecoveryComplete(); @@ -1962,8 +1966,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { InMemorySnapshotStore.addSnapshot("shard-manager-" + shardMrgIDSuffix, snapshot); // create shardManager to come up with restored data - TestActorRef newRestoredShardManager = actorFactory - .createTestActor(newShardMgrProps(mockConfig)); + TestActorRef newRestoredShardManager = actorFactory.createTestActor( + newShardMgrProps(mockConfig).withDispatcher(Dispatchers.DefaultDispatcherId())); newRestoredShardManager.underlyingActor().waitForRecoveryComplete(); @@ -1995,17 +1999,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("shard1", Arrays.asList("member-1")).put("shard2", Arrays.asList("member-1")).build()); String shardId1 = ShardIdentifier.create("shard1", MEMBER_1, shardMrgIDSuffix).toString(); - TestActorRef shard1 = actorFactory.createTestActor( - MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()), shardId1); + ActorRef shard1 = actorFactory.createActor(MessageCollectorActor.props(), shardId1); String shardId2 = ShardIdentifier.create("shard2", MEMBER_1, shardMrgIDSuffix).toString(); - TestActorRef shard2 = actorFactory.createTestActor( - MessageCollectorActor.props().withDispatcher(Dispatchers.DefaultDispatcherId()), shardId2); + ActorRef shard2 = actorFactory.createActor(MessageCollectorActor.props(), shardId2); - TestActorRef shardManager = actorFactory - .createTestActor(newTestShardMgrBuilder(mockConfig).addShardActor("shard1", shard1) - .addShardActor("shard2", shard2).props() - .withDispatcher(Dispatchers.DefaultDispatcherId())); + ActorRef shardManager = actorFactory.createActor(newTestShardMgrBuilder(mockConfig) + .addShardActor("shard1", shard1).addShardActor("shard2", shard2).props()); shardManager.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef()); shardManager.tell(new ActorInitialized(), shard1); @@ -2041,8 +2041,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - TestActorRef respondActor = actorFactory - .createTestActor(Props.create(MockRespondActor.class, ChangeServersVotingStatus.class, + ActorRef respondActor = actorFactory + .createActor(Props.create(MockRespondActor.class, ChangeServersVotingStatus.class, new ServerChangeReply(ServerChangeStatus.OK, null)), memberId); ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); @@ -2077,8 +2077,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - TestActorRef respondActor = actorFactory - .createTestActor(Props.create(MockRespondActor.class, ChangeServersVotingStatus.class, + ActorRef respondActor = actorFactory + .createActor(Props.create(MockRespondActor.class, ChangeServersVotingStatus.class, new ServerChangeReply(ServerChangeStatus.NO_LEADER, null)), memberId); ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor));