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%2Fshardmanager%2FShardManagerTest.java;h=4417051b0994e0c4af3de24fc4f5f1435f9256e8;hp=4eea96d752d2c3e4013f095c697e123ca62857b8;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hpb=1819f12a7e562482d9328a8e4c4aeffd2b1a2c01 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 4eea96d752..4417051b09 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 @@ -17,10 +17,8 @@ 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; @@ -43,13 +41,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.Uninterruptibles; -import java.net.URI; +import java.time.Duration; import java.util.AbstractMap; import java.util.Arrays; import java.util.Collection; @@ -63,6 +60,7 @@ 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.AfterClass; import org.junit.BeforeClass; @@ -128,13 +126,13 @@ 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.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +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.Duration; import scala.concurrent.duration.FiniteDuration; public class ShardManagerTest extends AbstractShardManagerTest { @@ -142,7 +140,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { 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 EffectiveModelContext TEST_SCHEMA_CONTEXT; private final String shardMgrID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString(); @@ -298,7 +296,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 +308,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()); @@ -352,7 +350,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary("non-existent", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), PrimaryNotFoundException.class); + kit.expectMsgClass(Duration.ofSeconds(5), PrimaryNotFoundException.class); } @Test @@ -377,7 +375,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - LocalPrimaryShardFound primaryFound = kit.expectMsgClass(kit.duration("5 seconds"), + LocalPrimaryShardFound primaryFound = kit.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); assertTrue("Unexpected primary path " + primaryFound.getPrimaryPath(), primaryFound.getPrimaryPath().contains("member-1-shard-default")); @@ -405,7 +403,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); LOG.info("testOnReceiveFindPrimaryForNonLocalLeaderShardBeforeMemberUp ending"); } @@ -431,8 +429,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - RemotePrimaryShardFound primaryFound = kit.expectMsgClass(kit.duration("5 seconds"), - RemotePrimaryShardFound.class); + RemotePrimaryShardFound primaryFound = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); assertTrue("Unexpected primary path " + primaryFound.getPrimaryPath(), primaryFound.getPrimaryPath().contains("member-2-shard-default")); assertEquals("getPrimaryVersion", leaderVersion, primaryFound.getPrimaryVersion()); @@ -447,7 +444,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); } @Test @@ -460,7 +457,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); } @Test @@ -479,7 +476,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); DataTree mockDataTree = mock(DataTree.class); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mockDataTree, @@ -487,7 +484,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, false), kit.getRef()); - LocalPrimaryShardFound primaryFound = kit.expectMsgClass(kit.duration("5 seconds"), + LocalPrimaryShardFound primaryFound = kit.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); assertTrue("Unexpected primary path " + primaryFound.getPrimaryPath(), primaryFound.getPrimaryPath().contains("member-1-shard-default")); @@ -511,30 +508,29 @@ public class ShardManagerTest extends AbstractShardManagerTest { // RoleChangeNotification. shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), kit.getRef()); - kit.expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(Duration.ofMillis(150)); shardManager.tell(new ActorInitialized(), mockShardActor); - kit.expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(Duration.ofMillis(150)); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.tell( new RoleChangeNotification(memberId, RaftState.Candidate.name(), RaftState.Leader.name()), mockShardActor); - kit.expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(Duration.ofMillis(150)); DataTree mockDataTree = mock(DataTree.class); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mockDataTree, DataStoreVersions.CURRENT_VERSION), mockShardActor); - LocalPrimaryShardFound primaryFound = kit.expectMsgClass(kit.duration("5 seconds"), - LocalPrimaryShardFound.class); + LocalPrimaryShardFound primaryFound = kit.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); assertTrue("Unexpected primary path " + primaryFound.getPrimaryPath(), primaryFound.getPrimaryPath().contains("member-1-shard-default")); assertSame("getLocalShardDataTree", mockDataTree, primaryFound.getLocalShardDataTree()); - kit.expectNoMessage(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(Duration.ofMillis(200)); LOG.info("testOnReceiveFindPrimaryWaitForShardLeader ending"); } @@ -549,11 +545,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), kit.getRef()); - kit.expectMsgClass(kit.duration("2 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(2), NotInitializedException.class); shardManager.tell(new ActorInitialized(), mockShardActor); - kit.expectNoMessage(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(Duration.ofMillis(200)); LOG.info("testOnReceiveFindPrimaryWaitForReadyWithUninitializedShard ending"); } @@ -571,7 +567,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), kit.getRef()); - kit.expectMsgClass(kit.duration("2 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(2), NoShardLeaderException.class); LOG.info("testOnReceiveFindPrimaryWaitForReadyWithCandidateShard ending"); } @@ -589,7 +585,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true),kit. getRef()); - kit.expectMsgClass(kit.duration("2 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(2), NoShardLeaderException.class); LOG.info("testOnReceiveFindPrimaryWaitForReadyWithIsolatedLeaderShard ending"); } @@ -605,7 +601,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), kit.getRef()); - kit.expectMsgClass(kit.duration("2 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(2), NoShardLeaderException.class); LOG.info("testOnReceiveFindPrimaryWaitForReadyWithNoRoleShard ending"); } @@ -658,7 +654,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.underlyingActor().waitForMemberUp(); shardManager1.tell(new FindPrimary("astronauts", false), kit.getRef()); - RemotePrimaryShardFound found = kit.expectMsgClass(kit.duration("5 seconds"), RemotePrimaryShardFound.class); + RemotePrimaryShardFound found = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); String path = found.getPrimaryPath(); assertTrue("Unexpected primary path " + path, path.contains("member-2-shard-astronauts-config")); assertEquals("getPrimaryVersion", leaderVersion, found.getPrimaryVersion()); @@ -673,7 +669,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { // // shardManager1.tell(new FindPrimary("astronauts", false), getRef()); // -// expectMsgClass(duration("5 seconds"), PrimaryNotFoundException.class); +// expectMsgClass(Duration.ofSeconds(5), PrimaryNotFoundException.class); LOG.info("testOnReceiveFindPrimaryForRemoteShard ending"); } @@ -733,7 +729,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - RemotePrimaryShardFound found = kit.expectMsgClass(kit.duration("5 seconds"), RemotePrimaryShardFound.class); + RemotePrimaryShardFound found = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); String path = found.getPrimaryPath(); assertTrue("Unexpected primary path " + path, path.contains("member-2-shard-default-config")); @@ -753,7 +749,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); shardManager1.tell(MockClusterWrapper.createReachableMember("member-2", "akka://cluster-test@127.0.0.1:2558"), kit.getRef()); @@ -766,7 +762,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - RemotePrimaryShardFound found1 = kit.expectMsgClass(kit.duration("5 seconds"), RemotePrimaryShardFound.class); + RemotePrimaryShardFound found1 = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); String path1 = found1.getPrimaryPath(); assertTrue("Unexpected primary path " + path1, path1.contains("member-2-shard-default-config")); @@ -786,7 +782,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell( MockClusterWrapper.createReachableMember("member-2", "akka://cluster-test@127.0.0.1:2558"), kit.getRef()); - RemotePrimaryShardFound found2 = kit.expectMsgClass(kit.duration("5 seconds"), RemotePrimaryShardFound.class); + RemotePrimaryShardFound found2 = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); String path2 = found2.getPrimaryPath(); assertTrue("Unexpected primary path " + path2, path2.contains("member-2-shard-default-config")); @@ -850,7 +846,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - RemotePrimaryShardFound found = kit.expectMsgClass(kit.duration("5 seconds"), RemotePrimaryShardFound.class); + RemotePrimaryShardFound found = kit.expectMsgClass(Duration.ofSeconds(5), RemotePrimaryShardFound.class); String path = found.getPrimaryPath(); assertTrue("Unexpected primary path " + path, path.contains("member-2-shard-default-config")); @@ -864,7 +860,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NoShardLeaderException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NoShardLeaderException.class); assertNull("Expected primaryShardInfoCache entry removed", primaryShardInfoCache.getIfPresent("default")); @@ -877,7 +873,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager1.tell(new FindPrimary("default", true), kit.getRef()); - LocalPrimaryShardFound found1 = kit.expectMsgClass(kit.duration("5 seconds"), LocalPrimaryShardFound.class); + LocalPrimaryShardFound found1 = kit.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); String path1 = found1.getPrimaryPath(); assertTrue("Unexpected primary path " + path1, path1.contains("member-1-shard-default-config")); @@ -946,8 +942,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager256.tell(new FindPrimary("default", true), kit256.getRef()); - LocalPrimaryShardFound found = kit256.expectMsgClass(kit256.duration("5 seconds"), - LocalPrimaryShardFound.class); + LocalPrimaryShardFound found = kit256.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); String path = found.getPrimaryPath(); assertTrue("Unexpected primary path " + path + " which must on member-256", path.contains("member-256-shard-default-config")); @@ -963,7 +958,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { // Make sure leader shard on member-256 is still leader and still in the cache. shardManager256.tell(new FindPrimary("default", true), kit256.getRef()); - found = kit256.expectMsgClass(kit256.duration("5 seconds"), LocalPrimaryShardFound.class); + found = kit256.expectMsgClass(Duration.ofSeconds(5), LocalPrimaryShardFound.class); path = found.getPrimaryPath(); assertTrue("Unexpected primary path " + path + " which must still not on member-256", path.contains("member-256-shard-default-config")); @@ -992,7 +987,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindLocalShard("non-existent", false), kit.getRef()); - LocalShardNotFound notFound = kit.expectMsgClass(kit.duration("5 seconds"), LocalShardNotFound.class); + LocalShardNotFound notFound = kit.expectMsgClass(Duration.ofSeconds(5), LocalShardNotFound.class); assertEquals("getShardName", "non-existent", notFound.getShardName()); } @@ -1007,7 +1002,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); - LocalShardFound found = kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + LocalShardFound found = kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); assertTrue("Found path contains " + found.getPath().path().toString(), found.getPath().path().toString().contains("member-1-shard-default-config")); @@ -1020,7 +1015,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); } @Test @@ -1050,15 +1045,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { TestShardManager shardManager = newTestShardManager(); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification( + shardManager.handleCommand(new RoleChangeNotification( memberId, RaftState.Candidate.name(), RaftState.Leader.name())); + assertFalse(ready.isDone()); - verify(ready, never()).countDown(); - - shardManager.onReceiveCommand(new ShardLeaderStateChanged(memberId, memberId, + shardManager.handleCommand(new ShardLeaderStateChanged(memberId, memberId, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION)); - - verify(ready, times(1)).countDown(); + assertTrue(ready.isDone()); } @Test @@ -1067,17 +1060,15 @@ public class ShardManagerTest extends AbstractShardManagerTest { TestShardManager shardManager = newTestShardManager(); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); - - verify(ready, never()).countDown(); + shardManager.handleCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); + assertFalse(ready.isDone()); - shardManager.onReceiveCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); + shardManager.handleCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); - shardManager.onReceiveCommand( + 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 @@ -1086,27 +1077,24 @@ public class ShardManagerTest extends AbstractShardManagerTest { TestShardManager shardManager = newTestShardManager(); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); - - verify(ready, never()).countDown(); + shardManager.handleCommand(new RoleChangeNotification(memberId, null, RaftState.Follower.name())); + assertFalse(ready.isDone()); - shardManager.onReceiveCommand( + shardManager.handleCommand( new ShardLeaderStateChanged(memberId, "member-2-shard-default-" + shardMrgIDSuffix, mock(DataTree.class), DataStoreVersions.CURRENT_VERSION)); - shardManager.onReceiveCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); - - verify(ready, times(1)).countDown(); + shardManager.handleCommand(MockClusterWrapper.createMemberUp("member-2", kit.getRef().path().toString())); + assertTrue(ready.isDone()); } @Test public void testRoleChangeNotificationDoNothingForUnknownShard() throws Exception { TestShardManager shardManager = newTestShardManager(); - shardManager.onReceiveCommand(new RoleChangeNotification("unknown", RaftState.Candidate.name(), + shardManager.handleCommand(new RoleChangeNotification("unknown", RaftState.Candidate.name(), RaftState.Leader.name())); - - verify(ready, never()).countDown(); + assertFalse(ready.isDone()); } @Test @@ -1120,7 +1108,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { public void testWhenShardIsLeaderSyncStatusIsTrue() throws Exception { TestShardManager shardManager = newTestShardManager(); - shardManager.onReceiveCommand(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, + shardManager.handleCommand(new RoleChangeNotification("member-1-shard-default-" + shardMrgIDSuffix, RaftState.Follower.name(), RaftState.Leader.name())); assertTrue(shardManager.getMBean().getSyncStatus()); @@ -1131,13 +1119,13 @@ public class ShardManagerTest extends AbstractShardManagerTest { TestShardManager shardManager = newTestShardManager(); String shardId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(shardId, + shardManager.handleCommand(new RoleChangeNotification(shardId, RaftState.Follower.name(), RaftState.Candidate.name())); assertFalse(shardManager.getMBean().getSyncStatus()); // Send a FollowerInitialSyncStatus with status = true for the replica whose current state is candidate - shardManager.onReceiveCommand(new FollowerInitialSyncUpStatus( + shardManager.handleCommand(new FollowerInitialSyncUpStatus( true, shardId)); assertFalse(shardManager.getMBean().getSyncStatus()); @@ -1148,19 +1136,19 @@ public class ShardManagerTest extends AbstractShardManagerTest { TestShardManager shardManager = newTestShardManager(); String shardId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(shardId, + shardManager.handleCommand(new RoleChangeNotification(shardId, RaftState.Candidate.name(), RaftState.Follower.name())); // Initially will be false assertFalse(shardManager.getMBean().getSyncStatus()); // Send status true will make sync status true - shardManager.onReceiveCommand(new FollowerInitialSyncUpStatus(true, shardId)); + shardManager.handleCommand(new FollowerInitialSyncUpStatus(true, shardId)); assertTrue(shardManager.getMBean().getSyncStatus()); // Send status false will make sync status false - shardManager.onReceiveCommand(new FollowerInitialSyncUpStatus(false, shardId)); + shardManager.handleCommand(new FollowerInitialSyncUpStatus(false, shardId)); assertFalse(shardManager.getMBean().getSyncStatus()); } @@ -1180,7 +1168,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { // Make default shard leader String defaultShardId = "member-1-shard-default-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(defaultShardId, + shardManager.handleCommand(new RoleChangeNotification(defaultShardId, RaftState.Follower.name(), RaftState.Leader.name())); // default = Leader, astronauts is unknown so sync status remains false @@ -1188,21 +1176,21 @@ public class ShardManagerTest extends AbstractShardManagerTest { // Make astronauts shard leader as well String astronautsShardId = "member-1-shard-astronauts-" + shardMrgIDSuffix; - shardManager.onReceiveCommand(new RoleChangeNotification(astronautsShardId, + shardManager.handleCommand(new RoleChangeNotification(astronautsShardId, RaftState.Follower.name(), RaftState.Leader.name())); // Now sync status should be true assertTrue(shardManager.getMBean().getSyncStatus()); // Make astronauts a Follower - shardManager.onReceiveCommand(new RoleChangeNotification(astronautsShardId, + shardManager.handleCommand(new RoleChangeNotification(astronautsShardId, RaftState.Leader.name(), RaftState.Follower.name())); // Sync status is not true assertFalse(shardManager.getMBean().getSyncStatus()); // Make the astronauts follower sync status true - shardManager.onReceiveCommand(new FollowerInitialSyncUpStatus(true, astronautsShardId)); + shardManager.handleCommand(new FollowerInitialSyncUpStatus(true, astronautsShardId)); // Sync status is now true assertTrue(shardManager.getMBean().getSyncStatus()); @@ -1241,22 +1229,22 @@ 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()); - kit.expectMsgClass(kit.duration("5 seconds"), Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Success.class); shardManager.tell(new FindLocalShard("foo", true), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); assertFalse("isRecoveryApplicable", shardBuilder.getDatastoreContext().isPersistent()); assertTrue("Epxected ShardPeerAddressResolver", shardBuilder.getDatastoreContext().getShardRaftConfig() @@ -1274,7 +1262,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new CreateShard(config, shardBuilder, null), kit.getRef()); - Success success = kit.expectMsgClass(kit.duration("5 seconds"), Success.class); + Success success = kit.expectMsgClass(Duration.ofSeconds(5), Success.class); assertNotNull("Success status is null", success.status()); LOG.info("testOnCreateShard ending"); @@ -1293,14 +1281,14 @@ 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()); - kit.expectMsgClass(kit.duration("5 seconds"), Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Success.class); shardManager.tell(new FindLocalShard("foo", true), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); assertEquals("peerMembers size", 0, shardBuilder.getPeerAddresses().size()); assertEquals("schemaContext", DisableElectionsRaftPolicy.class.getName(), shardBuilder @@ -1319,18 +1307,18 @@ 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(kit.duration("5 seconds"), Success.class); + 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()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); assertSame("schemaContext", schemaContext, shardBuilder.getSchemaContext()); assertNotNull("schemaContext is null", shardBuilder.getDatastoreContext()); @@ -1366,10 +1354,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 @@ -1390,7 +1376,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); @@ -1448,7 +1434,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new AddShardReplica("model-inventory"), kit.getRef()); - Status.Failure resp = kit.expectMsgClass(kit.duration("2 seconds"), Status.Failure.class); + Status.Failure resp = kit.expectMsgClass(Duration.ofSeconds(2), Status.Failure.class); assertTrue("Failure obtained", resp.cause() instanceof IllegalArgumentException); } @@ -1524,7 +1510,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { AddServer.class); String addServerId = "member-1-shard-astronauts-" + shardMrgIDSuffix; assertEquals("AddServer serverId", addServerId, addServerMsg.getNewServerId()); - kit.expectMsgClass(kit.duration("5 seconds"), Status.Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Status.Success.class); InMemorySnapshotStore.waitForSavedSnapshot(shardManagerID, ShardManagerSnapshot.class); InMemorySnapshotStore.waitForDeletedSnapshot(shardManagerID); @@ -1566,17 +1552,17 @@ public class ShardManagerTest extends AbstractShardManagerTest { MessageCollectorActor.expectFirstMatching(leaderShardActor, AddServer.class); - Failure resp = kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + Failure resp = kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); assertEquals("Failure cause", AlreadyExistsException.class, resp.cause().getClass()); shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); // Send message again to verify previous in progress state is // cleared shardManager.tell(new AddShardReplica(Shard.DEFAULT_NAME), kit.getRef()); - resp = kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + resp = kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); assertEquals("Failure cause", AlreadyExistsException.class, resp.cause().getClass()); // Send message again with an AddServer timeout to verify the @@ -1587,10 +1573,10 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreContextBuilder.shardLeaderElectionTimeout(100, TimeUnit.MILLISECONDS).build()), kit.getRef()); leaderShardActor.tell(MockRespondActor.CLEAR_RESPONSE, ActorRef.noSender()); shardManager.tell(new AddShardReplica(Shard.DEFAULT_NAME), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); LOG.info("testAddShardReplicaWithPreExistingReplicaInRemoteShardLeader ending"); } @@ -1611,11 +1597,11 @@ public class ShardManagerTest extends AbstractShardManagerTest { mockShardActor); shardManager.tell(new AddShardReplica(Shard.DEFAULT_NAME), kit.getRef()); - Failure resp = kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + Failure resp = kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); assertEquals("Failure cause", AlreadyExistsException.class, resp.cause().getClass()); shardManager.tell(new FindLocalShard(Shard.DEFAULT_NAME, false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardFound.class); LOG.info("testAddShardReplicaWithPreExistingLocalReplicaLeader ending"); } @@ -1647,18 +1633,18 @@ public class ShardManagerTest extends AbstractShardManagerTest { addServerMsg.getNewServerId()); mockShardLeaderKit.reply(new AddServerReply(ServerChangeStatus.TIMEOUT, null)); - Failure failure = kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + Failure failure = kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); assertEquals("Failure cause", TimeoutException.class, failure.cause().getClass()); shardManager.tell(new FindLocalShard("astronauts", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), LocalShardNotFound.class); + kit.expectMsgClass(Duration.ofSeconds(5), LocalShardNotFound.class); terminateWatcher.expectTerminated(mockNewReplicaShardActor); shardManager.tell(new AddShardReplica("astronauts"), kit.getRef()); mockShardLeaderKit.expectMsgClass(AddServer.class); mockShardLeaderKit.reply(new AddServerReply(ServerChangeStatus.NO_LEADER, null)); - failure = kit.expectMsgClass(kit.duration("5 seconds"), Failure.class); + failure = kit.expectMsgClass(Duration.ofSeconds(5), Failure.class); assertEquals("Failure cause", NoShardLeaderException.class, failure.cause().getClass()); LOG.info("testAddShardReplicaWithAddServerReplyFailure ending"); @@ -1686,7 +1672,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { AddressFromURIString.parse("akka://non-existent@127.0.0.1:5").toString()); newReplicaShardManager.tell(new AddShardReplica("astronauts"), kit.getRef()); - Status.Failure resp = kit.expectMsgClass(kit.duration("5 seconds"), Status.Failure.class); + Status.Failure resp = kit.expectMsgClass(Duration.ofSeconds(5), Status.Failure.class); assertTrue("Failure obtained", resp.cause() instanceof RuntimeException); LOG.info("testAddShardReplicaWithFindPrimaryTimeout ending"); @@ -1700,7 +1686,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .withDispatcher(Dispatchers.DefaultDispatcherId())); shardManager.tell(new RemoveShardReplica("model-inventory", MEMBER_1), kit.getRef()); - Status.Failure resp = kit.expectMsgClass(kit.duration("10 seconds"), Status.Failure.class); + Status.Failure resp = kit.expectMsgClass(Duration.ofSeconds(10), Status.Failure.class); assertTrue("Failure obtained", resp.cause() instanceof PrimaryNotFoundException); } @@ -1730,7 +1716,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { RemoveServer.class); assertEquals(ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(), removeServer.getServerId()); - kit.expectMsgClass(kit.duration("5 seconds"), Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Success.class); } @Test @@ -1818,7 +1804,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { RemoveServer.class); String removeServerId = ShardIdentifier.create("default", MEMBER_1, shardMrgIDSuffix).toString(); assertEquals("RemoveServer serverId", removeServerId, removeServer.getServerId()); - kit.expectMsgClass(kit.duration("5 seconds"), Status.Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Status.Success.class); } @Test @@ -1860,7 +1846,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(secondServerChange, secondRequestKit.getRef()); - secondRequestKit.expectMsgClass(secondRequestKit.duration("5 seconds"), Failure.class); + secondRequestKit.expectMsgClass(Duration.ofSeconds(5), Failure.class); } @Test @@ -1877,10 +1863,10 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.underlyingActor().waitForRecoveryComplete(); shardManager.tell(new FindLocalShard("people", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); shardManager.tell(new FindLocalShard("default", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); // Removed the default shard replica from member-1 ShardIdentifier.Builder builder = new ShardIdentifier.Builder(); @@ -1948,7 +1934,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { newRestoredShardManager.underlyingActor().waitForRecoveryComplete(); newRestoredShardManager.tell(new FindLocalShard("people", false), kit.getRef()); - LocalShardNotFound notFound = kit.expectMsgClass(kit.duration("5 seconds"), LocalShardNotFound.class); + LocalShardNotFound notFound = kit.expectMsgClass(Duration.ofSeconds(5), LocalShardNotFound.class); assertEquals("for uninitialized shard", "people", notFound.getShardName()); // Verify a local shard is created for the restored shards, @@ -1956,10 +1942,10 @@ public class ShardManagerTest extends AbstractShardManagerTest { // as the actor initialization // message is not sent for them newRestoredShardManager.tell(new FindLocalShard("default", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); newRestoredShardManager.tell(new FindLocalShard("astronauts", false), kit.getRef()); - kit.expectMsgClass(kit.duration("5 seconds"), NotInitializedException.class); + kit.expectMsgClass(Duration.ofSeconds(5), NotInitializedException.class); LOG.info("testShardPersistenceWithRestoredData ending"); } @@ -2035,7 +2021,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { .create("default", MemberName.forName("member-2"), shardMrgIDSuffix).toString(), Boolean.TRUE)); - kit.expectMsgClass(kit.duration("5 seconds"), Success.class); + kit.expectMsgClass(Duration.ofSeconds(5), Success.class); } @Test @@ -2058,7 +2044,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { MessageCollectorActor.expectFirstMatching(respondActor, ChangeServersVotingStatus.class); - Status.Failure resp = kit.expectMsgClass(kit.duration("5 seconds"), Status.Failure.class); + Status.Failure resp = kit.expectMsgClass(Duration.ofSeconds(5), Status.Failure.class); assertTrue("Failure resposnse", resp.cause() instanceof NoShardLeaderException); } @@ -2078,7 +2064,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { final Consumer mockCallback = mock(Consumer.class); shardManager.tell(new RegisterForShardAvailabilityChanges(mockCallback), kit.getRef()); - final Success reply = kit.expectMsgClass(Duration.apply(5, TimeUnit.SECONDS), Success.class); + final Success reply = kit.expectMsgClass(Duration.ofSeconds(5), Success.class); final Registration reg = (Registration) reply.status(); final DataTree mockDataTree = mock(DataTree.class); @@ -2272,7 +2258,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()); }