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=889f1d47e1f8c2c55437d28180e73b684d1629f1;hb=HEAD;hp=1efb1e9df4a8fa31f51b691653c73907a20d13b3;hpb=1e8d188e98614a1f3d781b2f80d61fcd0afde368;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 1efb1e9df4..889f1d47e1 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 @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore.shardmanager; +import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -17,16 +18,15 @@ import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.AddressFromURIString; +import akka.actor.PoisonPill; import akka.actor.Props; import akka.actor.Status; import akka.actor.Status.Failure; @@ -43,13 +43,12 @@ import akka.serialization.Serialization; import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; import akka.util.Timeout; -import com.google.common.base.Function; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import com.google.common.util.concurrent.SettableFuture; import com.google.common.util.concurrent.Uninterruptibles; -import java.net.URI; import java.time.Duration; import java.util.AbstractMap; import java.util.Arrays; @@ -64,18 +63,24 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; +import java.util.function.Function; import java.util.stream.Collectors; +import org.junit.After; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.cluster.access.concepts.MemberName; -import org.opendaylight.controller.cluster.datastore.AbstractShardManagerTest; +import org.opendaylight.controller.cluster.databroker.ClientBackedDataStore; +import org.opendaylight.controller.cluster.datastore.AbstractClusterRefActorTest; import org.opendaylight.controller.cluster.datastore.ClusterWrapperImpl; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.cluster.datastore.DatastoreContext; import org.opendaylight.controller.cluster.datastore.DatastoreContextFactory; -import org.opendaylight.controller.cluster.datastore.DistributedDataStore; import org.opendaylight.controller.cluster.datastore.Shard; +import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl; import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConfigProvider; import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration; @@ -94,8 +99,6 @@ import org.opendaylight.controller.cluster.datastore.messages.FindPrimary; import org.opendaylight.controller.cluster.datastore.messages.LocalPrimaryShardFound; import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound; import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound; -import org.opendaylight.controller.cluster.datastore.messages.PeerDown; -import org.opendaylight.controller.cluster.datastore.messages.PeerUp; import org.opendaylight.controller.cluster.datastore.messages.PrimaryShardInfo; import org.opendaylight.controller.cluster.datastore.messages.RemotePrimaryShardFound; import org.opendaylight.controller.cluster.datastore.messages.RemoveShardReplica; @@ -112,6 +115,7 @@ import org.opendaylight.controller.cluster.notifications.LeaderStateChanged; import org.opendaylight.controller.cluster.notifications.RegisterRoleChangeListener; import org.opendaylight.controller.cluster.notifications.RoleChangeNotification; import org.opendaylight.controller.cluster.raft.RaftState; +import org.opendaylight.controller.cluster.raft.TestActorFactory; import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus; import org.opendaylight.controller.cluster.raft.base.messages.SwitchBehavior; import org.opendaylight.controller.cluster.raft.client.messages.GetSnapshot; @@ -125,24 +129,39 @@ import org.opendaylight.controller.cluster.raft.messages.ServerChangeReply; import org.opendaylight.controller.cluster.raft.messages.ServerChangeStatus; import org.opendaylight.controller.cluster.raft.messages.ServerRemoved; import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy; +import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.common.Empty; +import org.opendaylight.yangtools.yang.common.XMLNamespace; +import org.opendaylight.yangtools.yang.data.tree.api.DataTree; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; -public class ShardManagerTest extends AbstractShardManagerTest { +@RunWith(MockitoJUnitRunner.StrictStubs.class) +public class ShardManagerTest extends AbstractClusterRefActorTest { private static final Logger LOG = LoggerFactory.getLogger(ShardManagerTest.class); + private static final MemberName MEMBER_1 = MemberName.forName("member-1"); private static final MemberName MEMBER_2 = MemberName.forName("member-2"); private static final MemberName MEMBER_3 = MemberName.forName("member-3"); - private static SchemaContext TEST_SCHEMA_CONTEXT; + private static int ID_COUNTER = 1; + private static ActorRef mockShardActor; + private static ShardIdentifier mockShardName; + private static SettableFuture ready; + private static EffectiveModelContext TEST_SCHEMA_CONTEXT; + + private final String shardMrgIDSuffix = "config" + ID_COUNTER++; + private final TestActorFactory actorFactory = new TestActorFactory(getSystem()); + private final DatastoreContext.Builder datastoreContextBuilder = DatastoreContext.newBuilder() + .dataStoreName(shardMrgIDSuffix).shardInitializationTimeout(600, TimeUnit.MILLISECONDS) + .shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(6); private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -156,6 +175,50 @@ public class ShardManagerTest extends AbstractShardManagerTest { TEST_SCHEMA_CONTEXT = null; } + @Before + public void setUp() { + ready = SettableFuture.create(); + + InMemoryJournal.clear(); + InMemorySnapshotStore.clear(); + + if (mockShardActor == null) { + mockShardName = ShardIdentifier.create(Shard.DEFAULT_NAME, MEMBER_1, "config"); + mockShardActor = getSystem().actorOf(MessageCollectorActor.props(), mockShardName.toString()); + } + + MessageCollectorActor.clearMessages(mockShardActor); + } + + @After + public void tearDown() { + InMemoryJournal.clear(); + InMemorySnapshotStore.clear(); + + mockShardActor.tell(PoisonPill.getInstance(), ActorRef.noSender()); + await().atMost(Duration.ofSeconds(10)).until(mockShardActor::isTerminated); + mockShardActor = null; + + actorFactory.close(); + } + + private TestShardManager.Builder newTestShardMgrBuilder() { + return TestShardManager.builder(datastoreContextBuilder) + .distributedDataStore(mock(ClientBackedDataStore.class)); + } + + private TestShardManager.Builder newTestShardMgrBuilder(final Configuration config) { + return newTestShardMgrBuilder().configuration(config); + } + + private Props newShardMgrProps() { + return newShardMgrProps(new MockConfiguration()); + } + + private Props newShardMgrProps(final Configuration config) { + return newTestShardMgrBuilder(config).readinessFuture(ready).props(); + } + private ActorSystem newActorSystem(final String config) { return newActorSystem("cluster-test", config); } @@ -169,10 +232,6 @@ public class ShardManagerTest extends AbstractShardManagerTest { return system.actorOf(MessageCollectorActor.props(), name); } - private Props newShardMgrProps() { - return newShardMgrProps(new MockConfiguration()); - } - private static DatastoreContextFactory newDatastoreContextFactory(final DatastoreContext datastoreContext) { DatastoreContextFactory mockFactory = mock(DatastoreContextFactory.class); doReturn(datastoreContext).when(mockFactory).getBaseDatastoreContext(); @@ -185,8 +244,9 @@ public class ShardManagerTest extends AbstractShardManagerTest { } private TestShardManager.Builder newTestShardMgrBuilderWithMockShardActor(final ActorRef shardActor) { - return TestShardManager.builder(datastoreContextBuilder).shardActor(shardActor) - .distributedDataStore(mock(DistributedDataStore.class)); + return TestShardManager.builder(datastoreContextBuilder) + .shardActor(shardActor) + .distributedDataStore(mock(ClientBackedDataStore.class)); } @@ -298,7 +358,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } } - final Creator creator = new Creator() { + final Creator creator = new Creator<>() { private static final long serialVersionUID = 1L; @Override public ShardManager create() { @@ -310,7 +370,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final TestKit kit = new TestKit(getSystem()); - final ActorRef shardManager = actorFactory.createActor(Props.create( + final ActorRef shardManager = actorFactory.createActor(Props.create(ShardManager.class, new DelegatingShardManagerCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); @@ -364,7 +424,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); DataTree mockDataTree = mock(DataTree.class); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mockDataTree, @@ -393,7 +453,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; String memberId1 = "member-1-shard-default-" + shardMrgIDSuffix; @@ -417,7 +477,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; MockClusterWrapper.sendMemberUp(shardManager, "member-2", kit.getRef().path().toString()); @@ -455,7 +515,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); @@ -469,7 +529,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.tell( @@ -512,7 +572,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { kit.expectNoMessage(Duration.ofMillis(150)); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); kit.expectNoMessage(Duration.ofMillis(150)); @@ -549,7 +609,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { kit.expectMsgClass(Duration.ofSeconds(2), NotInitializedException.class); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); kit.expectNoMessage(Duration.ofMillis(200)); @@ -563,7 +623,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null, RaftState.Candidate.name()), mockShardActor); @@ -581,7 +641,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, null, RaftState.IsolatedLeader.name()), mockShardActor); @@ -599,7 +659,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), kit.getRef()); @@ -644,7 +704,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager2.tell(new ActorInitialized(), mockShardActor2); + shardManager2.tell(new ActorInitialized(mockShardActor2), ActorRef.noSender()); String memberId2 = "member-2-shard-astronauts-" + shardMrgIDSuffix; short leaderVersion = DataStoreVersions.CURRENT_VERSION - 1; @@ -712,8 +772,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { final TestKit kit = new TestKit(system1); shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager1.tell(new ActorInitialized(), mockShardActor1); - shardManager2.tell(new ActorInitialized(), mockShardActor2); + shardManager1.tell(new ActorInitialized(mockShardActor1), ActorRef.noSender()); + shardManager2.tell(new ActorInitialized(mockShardActor1), ActorRef.noSender()); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; String memberId1 = "member-1-shard-default-" + shardMrgIDSuffix; @@ -739,16 +799,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { kit.getRef()); shardManager1.underlyingActor().waitForUnreachableMember(); - - PeerDown peerDown = MessageCollectorActor.expectFirstMatching(mockShardActor1, PeerDown.class); - assertEquals("getMemberName", MEMBER_2, peerDown.getMemberName()); MessageCollectorActor.clearMessages(mockShardActor1); shardManager1.tell(MockClusterWrapper.createMemberRemoved("member-2", "akka://cluster-test@127.0.0.1:2558"), kit.getRef()); - MessageCollectorActor.expectFirstMatching(mockShardActor1, PeerDown.class); - shardManager1.tell(new FindPrimary("default", true), kit.getRef()); kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); @@ -758,10 +813,6 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.underlyingActor().waitForReachableMember(); - PeerUp peerUp = MessageCollectorActor.expectFirstMatching(mockShardActor1, PeerUp.class); - assertEquals("getMemberName", MEMBER_2, peerUp.getMemberName()); - MessageCollectorActor.clearMessages(mockShardActor1); - shardManager1.tell(new FindPrimary("default", true), kit.getRef()); RemotePrimaryShardFound found1 = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); @@ -771,8 +822,6 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(MockClusterWrapper.createMemberUp("member-2", "akka://cluster-test@127.0.0.1:2558"), kit.getRef()); - MessageCollectorActor.expectFirstMatching(mockShardActor1, PeerUp.class); - // Test FindPrimary wait succeeds after reachable member event. shardManager1.tell(MockClusterWrapper.createUnreachableMember("member-2", @@ -829,8 +878,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { final TestKit kit = new TestKit(system1); shardManager1.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager1.tell(new ActorInitialized(), mockShardActor1); - shardManager2.tell(new ActorInitialized(), mockShardActor2); + shardManager1.tell(new ActorInitialized(mockShardActor1), ActorRef.noSender()); + shardManager2.tell(new ActorInitialized(mockShardActor2), ActorRef.noSender()); String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; String memberId1 = "member-1-shard-default-" + shardMrgIDSuffix; @@ -925,8 +974,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { final TestKit kit256 = new TestKit(system256); shardManager256.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit256.getRef()); shardManager2.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit256.getRef()); - shardManager256.tell(new ActorInitialized(), mockShardActor256); - shardManager2.tell(new ActorInitialized(), mockShardActor2); + shardManager256.tell(new ActorInitialized(mockShardActor256), ActorRef.noSender()); + shardManager2.tell(new ActorInitialized(mockShardActor2), ActorRef.noSender()); String memberId256 = "member-256-shard-default-" + shardMrgIDSuffix; String memberId2 = "member-2-shard-default-" + shardMrgIDSuffix; @@ -1000,7 +1049,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); @@ -1034,7 +1083,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { Future future = Patterns.ask(shardManager, new FindLocalShard(Shard.DEFAULT_NAME, true), new Timeout(5, TimeUnit.SECONDS)); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); Object resp = Await.result(future, kit.duration("5 seconds")); assertTrue("Expected: LocalShardFound, Actual: " + resp, resp instanceof LocalShardFound); @@ -1049,13 +1098,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.handleCommand(new RoleChangeNotification( memberId, RaftState.Candidate.name(), RaftState.Leader.name())); - - verify(ready, never()).countDown(); + assertFalse(ready.isDone()); shardManager.handleCommand(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION)); - - verify(ready, times(1)).countDown(); + assertTrue(ready.isDone()); } @Test @@ -1065,16 +1112,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.handleCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); - - verify(ready, never()).countDown(); + assertFalse(ready.isDone()); shardManager.handleCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); shardManager.handleCommand( new ShardLeaderStateChanged(memberId, "member-2-shard-default-" + shardMrgIDSuffix, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION)); - - verify(ready, times(1)).countDown(); + assertTrue(ready.isDone()); } @Test @@ -1084,16 +1129,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.handleCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); - - verify(ready, never()).countDown(); + assertFalse(ready.isDone()); shardManager.handleCommand( new ShardLeaderStateChanged(memberId, "member-2-shard-default-" + shardMrgIDSuffix, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION)); shardManager.handleCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); - - verify(ready, times(1)).countDown(); + assertTrue(ready.isDone()); } @Test @@ -1102,8 +1145,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.handleCommand(new RoleChangeNotification("unknown", RaftState.Candidate.name(), RaftState.Leader.name())); - - verify(ready, never()).countDown(); + assertFalse(ready.isDone()); } @Test @@ -1213,7 +1255,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new SwitchShardBehavior(mockShardName, RaftState.Leader, 1000), kit.getRef()); @@ -1238,14 +1280,14 @@ public class ShardManagerTest extends AbstractShardManagerTest { .createActor(newShardMgrProps(new ConfigurationImpl(new EmptyModuleShardConfigProvider())) .withDispatcher(Dispatchers.DefaultDispatcherId())); - SchemaContext schemaContext = TEST_SCHEMA_CONTEXT; + EffectiveModelContext schemaContext = TEST_SCHEMA_CONTEXT; shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender()); DatastoreContext datastoreContext = DatastoreContext.newBuilder().shardElectionTimeoutFactor(100) .persistent(false).build(); Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-1", "member-5", "member-6")); shardManager.tell(new CreateShard(config, shardBuilder, datastoreContext), kit.getRef()); @@ -1290,7 +1332,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), ActorRef.noSender()); Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-5", "member-6")); shardManager.tell(new CreateShard(config, shardBuilder, null), kit.getRef()); @@ -1316,13 +1358,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { Shard.Builder shardBuilder = Shard.builder(); - ModuleShardConfiguration config = new ModuleShardConfiguration(URI.create("foo-ns"), "foo-module", + ModuleShardConfiguration config = new ModuleShardConfiguration(XMLNamespace.of("foo-ns"), "foo-module", "foo", null, members("member-1")); shardManager.tell(new CreateShard(config, shardBuilder, null), kit.getRef()); kit.expectMsgClass(Duration.ofSeconds(5), Success.class); - SchemaContext schemaContext = TEST_SCHEMA_CONTEXT; + EffectiveModelContext schemaContext = TEST_SCHEMA_CONTEXT; shardManager.tell(new UpdateSchemaContext(schemaContext), ActorRef.noSender()); shardManager.tell(new FindLocalShard("foo", true), kit.getRef()); @@ -1363,10 +1405,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { assertEquals("getType", shardMrgIDSuffix, datastoreSnapshot.getType()); assertNull("Expected null ShardManagerSnapshot", datastoreSnapshot.getShardManagerSnapshot()); - Function shardNameTransformer = ShardSnapshot::getName; - assertEquals("Shard names", Sets.newHashSet("shard1", "shard2"), Sets.newHashSet( - datastoreSnapshot.getShardSnapshots().stream().map(shardNameTransformer).collect(Collectors.toSet()))); + datastoreSnapshot.getShardSnapshots().stream().map(ShardSnapshot::getName).collect(Collectors.toSet()))); // Add a new replica @@ -1387,7 +1427,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreSnapshot = expectMsgClassOrFailure(DatastoreSnapshot.class, kit, "GetSnapshot"); assertEquals("Shard names", Sets.newHashSet("shard1", "shard2", "astronauts"), Sets.newHashSet( - Lists.transform(datastoreSnapshot.getShardSnapshots(), shardNameTransformer))); + Lists.transform(datastoreSnapshot.getShardSnapshots(), ShardSnapshot::getName))); ShardManagerSnapshot snapshot = datastoreSnapshot.getShardManagerSnapshot(); assertNotNull("Expected ShardManagerSnapshot", snapshot); @@ -1410,7 +1450,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("astronauts", Collections.emptyList()).build()); ShardManagerSnapshot snapshot = - new ShardManagerSnapshot(Arrays.asList("shard1", "shard2", "astronauts"), Collections.emptyMap()); + new ShardManagerSnapshot(Arrays.asList("shard1", "shard2", "astronauts")); DatastoreSnapshot restoreFromSnapshot = new DatastoreSnapshot(shardMrgIDSuffix, snapshot, Collections.emptyList()); TestActorRef shardManager = actorFactory.createTestActor(newTestShardMgrBuilder(mockConfig) @@ -1491,7 +1531,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor); + leaderShardManager.tell(new ActorInitialized(mockShardLeaderActor), ActorRef.noSender()); short leaderVersion = DataStoreVersions.CURRENT_VERSION - 1; leaderShardManager.tell( @@ -1508,7 +1548,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { // persisted. String[] restoredShards = { "default", "people" }; ShardManagerSnapshot snapshot = - new ShardManagerSnapshot(Arrays.asList(restoredShards), Collections.emptyMap()); + new ShardManagerSnapshot(Arrays.asList(restoredShards)); InMemorySnapshotStore.addSnapshot(shardManagerID, snapshot); Uninterruptibles.sleepUninterruptibly(2, TimeUnit.MILLISECONDS); @@ -1542,7 +1582,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .createTestActor(newPropsShardMgrWithMockShardActor(), shardMgrID); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); String leaderId = "leader-member-shard-default-" + shardMrgIDSuffix; AddServerReply addServerReply = new AddServerReply(ServerChangeStatus.ALREADY_EXISTS, null); @@ -1600,7 +1640,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), kit.getRef()); shardManager.tell( @@ -1715,7 +1755,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), respondActor); + shardManager.tell(new ActorInitialized(respondActor), ActorRef.noSender()); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), kit.getRef()); shardManager.tell( @@ -1787,8 +1827,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { newReplicaShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); leaderShardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - leaderShardManager.tell(new ActorInitialized(), mockShardLeaderActor); - newReplicaShardManager.tell(new ActorInitialized(), mockShardLeaderActor); + leaderShardManager.tell(new ActorInitialized(mockShardLeaderActor), ActorRef.noSender()); + newReplicaShardManager.tell(new ActorInitialized(mockShardLeaderActor), ActorRef.noSender()); short leaderVersion = DataStoreVersions.CURRENT_VERSION - 1; leaderShardManager.tell( @@ -1909,7 +1949,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor().waitForRecoveryComplete(); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), shard); + shardManager.tell(new ActorInitialized(shard), ActorRef.noSender()); waitForShardInitialized(shardManager, "people", kit); waitForShardInitialized(shardManager, "default", kit); @@ -1935,7 +1975,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .put("people", Arrays.asList("member-1", "member-2")).build()); String[] restoredShards = {"default", "astronauts"}; ShardManagerSnapshot snapshot = - new ShardManagerSnapshot(Arrays.asList(restoredShards), Collections.emptyMap()); + new ShardManagerSnapshot(Arrays.asList(restoredShards)); InMemorySnapshotStore.addSnapshot("shard-manager-" + shardMrgIDSuffix, snapshot); // create shardManager to come up with restored data @@ -1978,8 +2018,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { .addShardActor("shard1", shard1).addShardActor("shard2", shard2).props()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), shard1); - shardManager.tell(new ActorInitialized(), shard2); + shardManager.tell(new ActorInitialized(shard1), ActorRef.noSender()); + shardManager.tell(new ActorInitialized(shard2), ActorRef.noSender()); FiniteDuration duration = FiniteDuration.create(5, TimeUnit.SECONDS); Future stopFuture = Patterns.gracefulStop(shardManager, duration, Shutdown.INSTANCE); @@ -2015,7 +2055,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), respondActor); + shardManager.tell(new ActorInitialized(respondActor), ActorRef.noSender()); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION), kit.getRef()); shardManager.tell( @@ -2047,7 +2087,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { ActorRef shardManager = getSystem().actorOf(newPropsShardMgrWithMockShardActor(respondActor)); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), respondActor); + shardManager.tell(new ActorInitialized(respondActor), ActorRef.noSender()); shardManager.tell(new RoleChangeNotification(memberId, null, RaftState.Follower.name()), respondActor); shardManager.tell( @@ -2070,7 +2110,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final ActorRef shardManager = actorFactory.createActor(newPropsShardMgrWithMockShardActor()); shardManager.tell(new UpdateSchemaContext(TEST_SCHEMA_CONTEXT), kit.getRef()); - shardManager.tell(new ActorInitialized(), mockShardActor); + shardManager.tell(new ActorInitialized(mockShardActor), ActorRef.noSender()); final Consumer mockCallback = mock(Consumer.class); shardManager.tell(new RegisterForShardAvailabilityChanges(mockCallback), kit.getRef()); @@ -2226,7 +2266,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { } Builder shardActor(final ActorRef newShardActor) { - this.shardActor = newShardActor; + shardActor = newShardActor; return this; } @@ -2269,7 +2309,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { AbstractGenericCreator(final Class shardManagerClass) { this.shardManagerClass = shardManagerClass; - cluster(new MockClusterWrapper()).configuration(new MockConfiguration()).waitTillReadyCountDownLatch(ready) + cluster(new MockClusterWrapper()).configuration(new MockConfiguration()).readinessFuture(ready) .primaryShardInfoCache(new PrimaryShardInfoFutureCache()); }