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%2Fentityownership%2FDistributedEntityOwnershipIntegrationTest.java;h=4855baec6ac7a802f7d6309950bba996237aae96;hb=refs%2Fchanges%2F95%2F56295%2F3;hp=893ac52b05a36b418ba7ab1ee8e7688b20056278;hpb=6b31b94c7c06711efd69f7fd456167026f34dc2e;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java index 893ac52b05..4855baec6a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipIntegrationTest.java @@ -22,6 +22,7 @@ import static org.opendaylight.controller.cluster.datastore.entityownership.Abst import static org.opendaylight.controller.cluster.datastore.entityownership.DistributedEntityOwnershipService.ENTITY_OWNERSHIP_SHARD_NAME; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.CANDIDATE_NAME_NODE_ID; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityPath; + import akka.actor.ActorRef; import akka.actor.Status.Failure; import akka.actor.Status.Success; @@ -44,8 +45,9 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; +import org.mockito.exceptions.base.MockitoException; +import org.opendaylight.controller.cluster.datastore.AbstractDataStore; import org.opendaylight.controller.cluster.datastore.DatastoreContext; -import org.opendaylight.controller.cluster.datastore.DistributedDataStore; import org.opendaylight.controller.cluster.datastore.IntegrationTestKit; import org.opendaylight.controller.cluster.datastore.MemberNode; import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; @@ -55,7 +57,6 @@ import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolic import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; -import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipCandidateRegistration; @@ -87,8 +88,8 @@ public class DistributedEntityOwnershipIntegrationTest { private static final SchemaContext SCHEMA_CONTEXT = SchemaContextHelper.entityOwners(); private final DatastoreContext.Builder leaderDatastoreContextBuilder = - DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5). - shardIsolatedLeaderCheckIntervalInMillis(1000000); + DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5) + .shardIsolatedLeaderCheckIntervalInMillis(1000000); private final DatastoreContext.Builder followerDatastoreContextBuilder = DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(10000); @@ -122,35 +123,37 @@ public class DistributedEntityOwnershipIntegrationTest { memberNodes.clear(); } - private static DistributedEntityOwnershipService newOwnershipService(final DistributedDataStore datastore) { + private static DistributedEntityOwnershipService newOwnershipService(final AbstractDataStore datastore) { return DistributedEntityOwnershipService.start(datastore.getActorContext(), EntityOwnerSelectionStrategyConfig.newBuilder().build()); } @Test public void testFunctionalityWithThreeNodes() throws Exception { - String name = "test"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + String name = "testFunctionalityWithThreeNodes"; + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + final DOMEntityOwnershipService follower2EntityOwnershipService = + newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -181,22 +184,25 @@ public class DistributedEntityOwnershipIntegrationTest { follower1EntityOwnershipService.registerCandidate(ENTITY1); verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1", "member-2"); verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); + verifyOwner(follower2Node.configDataStore(), ENTITY1, "member-1"); Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS); verify(leaderMockListener, never()).ownershipChanged(ownershipChange(ENTITY1)); verify(follower1MockListener, never()).ownershipChanged(ownershipChange(ENTITY1)); // Register follower1 candidate for entity2 and verify it becomes owner - DOMEntityOwnershipCandidateRegistration follower1Entity2Reg = follower1EntityOwnershipService.registerCandidate(ENTITY2); + final DOMEntityOwnershipCandidateRegistration follower1Entity2Reg = + follower1EntityOwnershipService.registerCandidate(ENTITY2); verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, false, true)); + verifyOwner(follower2Node.configDataStore(), ENTITY2, "member-2"); reset(leaderMockListener, follower1MockListener); // Register follower2 candidate for entity2 and verify it gets added but doesn't become owner follower2EntityOwnershipService.registerListener(ENTITY_TYPE1, follower2MockListener); - verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, false, true)); - verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true)); + verify(follower2MockListener, timeout(5000).times(2)).ownershipChanged(or( + ownershipChange(ENTITY1, false, false, true), ownershipChange(ENTITY2, false, false, true))); follower2EntityOwnershipService.registerCandidate(ENTITY2); verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-2", "member-3"); @@ -239,22 +245,20 @@ public class DistributedEntityOwnershipIntegrationTest { verifyCandidates(leaderDistributedDataStore, ENTITY4, "member-3", "member-2"); verifyOwner(leaderDistributedDataStore, ENTITY4, "member-3"); - // Shutdown follower2 and verify it's owned entities (entity 2 & 4) get re-assigned + // Shutdown follower2 and verify it's owned entities (entity 4) get re-assigned reset(leaderMockListener, follower1MockListener); follower2Node.cleanup(); - verify(follower1MockListener, timeout(15000).times(2)).ownershipChanged(or(ownershipChange(ENTITY4, false, true, true), - ownershipChange(ENTITY2, false, false, false))); - verify(leaderMockListener, timeout(15000).times(2)).ownershipChanged(or(ownershipChange(ENTITY4, false, false, true), - ownershipChange(ENTITY2, false, false, false))); - verifyOwner(leaderDistributedDataStore, ENTITY2, ""); // no other candidate + verify(follower1MockListener, timeout(15000)).ownershipChanged(ownershipChange(ENTITY4, false, true, true)); + verify(leaderMockListener, timeout(15000)).ownershipChanged(ownershipChange(ENTITY4, false, false, true)); // Register leader candidate for entity2 and verify it becomes owner - DOMEntityOwnershipCandidateRegistration leaderEntity2Reg = leaderEntityOwnershipService.registerCandidate(ENTITY2); - verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); + DOMEntityOwnershipCandidateRegistration leaderEntity2Reg = + leaderEntityOwnershipService.registerCandidate(ENTITY2); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); + verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); // Unregister leader candidate for entity2 and verify the owner is cleared @@ -265,32 +269,34 @@ public class DistributedEntityOwnershipIntegrationTest { } @Test - public void testLeaderCandidatesRemovedAfterShutdown() throws Exception { - followerDatastoreContextBuilder.shardElectionTimeoutFactor(5). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); + public void testLeaderEntityOwnersReassignedAfterShutdown() throws Exception { + followerDatastoreContextBuilder.shardElectionTimeoutFactor(5) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - String name = "test"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + String name = "testLeaderEntityOwnersReassignedAfterShutdown"; + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + final DOMEntityOwnershipService follower2EntityOwnershipService = + newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -323,59 +329,67 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on follower1 so it becomes the leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore(). - getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); - follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, raftState -> assertEquals("Raft state", RaftState.Leader.toString(), raftState.getRaftState())); - // Verify the prior leader's candidates are removed + // Verify the prior leader's entity owners are re-assigned. - verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2"); - verifyCandidates(follower1Node.configDataStore(), ENTITY2, "member-3"); + verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2", "member-1"); + verifyCandidates(follower1Node.configDataStore(), ENTITY2, "member-1", "member-3"); verifyOwner(follower1Node.configDataStore(), ENTITY1, "member-2"); verifyOwner(follower1Node.configDataStore(), ENTITY2, "member-3"); } @Test - public void testLeaderAndFollowerCandidatesRemovedAfterShutdown() throws Exception { - followerDatastoreContextBuilder.shardElectionTimeoutFactor(5). - customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); - - String name = "test"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); - - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); - - MemberNode follower3Node = MemberNode.builder(memberNodes).akkaConfig("Member4").testName(name ). - moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); - - MemberNode follower4Node = MemberNode.builder(memberNodes).akkaConfig("Member5").testName(name ). - moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); - - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + public void testLeaderAndFollowerEntityOwnersReassignedAfterShutdown() throws Exception { + followerDatastoreContextBuilder.shardElectionTimeoutFactor(5) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); + + String name = "testLeaderAndFollowerEntityOwnersReassignedAfterShutdown"; + final MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1") + .useAkkaArtery(false).testName(name) + .moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT) + .createOperDatastore(false).datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + + final MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2") + .useAkkaArtery(false).testName(name) + .moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT) + .createOperDatastore(false).datastoreContextBuilder(followerDatastoreContextBuilder).build(); + + final MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3") + .useAkkaArtery(false).testName(name) + .moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT) + .createOperDatastore(false).datastoreContextBuilder(followerDatastoreContextBuilder).build(); + + final MemberNode follower3Node = MemberNode.builder(memberNodes).akkaConfig("Member4") + .useAkkaArtery(false).testName(name) + .moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT) + .createOperDatastore(false).datastoreContextBuilder(followerDatastoreContextBuilder).build(); + + final MemberNode follower4Node = MemberNode.builder(memberNodes).akkaConfig("Member5") + .useAkkaArtery(false).testName(name) + .moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT) + .createOperDatastore(false).datastoreContextBuilder(followerDatastoreContextBuilder).build(); + + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - DOMEntityOwnershipService follower3EntityOwnershipService = newOwnershipService(follower3Node.configDataStore()); - DOMEntityOwnershipService follower4EntityOwnershipService = newOwnershipService(follower4Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + final DOMEntityOwnershipService follower2EntityOwnershipService = + newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService follower3EntityOwnershipService = + newOwnershipService(follower3Node.configDataStore()); + newOwnershipService(follower4Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -407,8 +421,7 @@ public class DistributedEntityOwnershipIntegrationTest { verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3", "member-4"); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); - - // Shutdown the leader and verify its removed from the candidate list + // Shutdown the leader and follower3 leaderNode.cleanup(); follower3Node.cleanup(); @@ -418,51 +431,51 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on follower1 so it becomes the leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore(). - getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); - follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()). - customRaftPolicyImplementation(null).build(), ActorRef.noSender()); + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Raft state", RaftState.Leader.toString(), raftState.getRaftState())); + raftState -> assertEquals("Raft state", RaftState.Leader.toString(), raftState.getRaftState())); - // Verify the prior leader's and follower3 candidates are removed + // Verify the prior leader's and follower3 entity owners are re-assigned. - verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2"); - verifyCandidates(follower1Node.configDataStore(), ENTITY2, "member-3"); + verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2", "member-1"); + verifyCandidates(follower1Node.configDataStore(), ENTITY2, "member-1", "member-3", "member-4"); verifyOwner(follower1Node.configDataStore(), ENTITY1, "member-2"); verifyOwner(follower1Node.configDataStore(), ENTITY2, "member-3"); } /** - * Reproduces bug 4554 - * - * @throws CandidateAlreadyRegisteredException + * Reproduces bug 4554. */ @Test - public void testCloseCandidateRegistrationInQuickSuccession() throws CandidateAlreadyRegisteredException { + public void testCloseCandidateRegistrationInQuickSuccession() throws Exception { String name = "testCloseCandidateRegistrationInQuickSuccession"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + final DOMEntityOwnershipService follower2EntityOwnershipService = + newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -470,17 +483,26 @@ public class DistributedEntityOwnershipIntegrationTest { follower1EntityOwnershipService.registerListener(ENTITY_TYPE1, follower1MockListener); follower2EntityOwnershipService.registerListener(ENTITY_TYPE1, follower2MockListener); - final DOMEntityOwnershipCandidateRegistration candidate1 = leaderEntityOwnershipService.registerCandidate(ENTITY1); + final DOMEntityOwnershipCandidateRegistration candidate1 = + leaderEntityOwnershipService.registerCandidate(ENTITY1); verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, true, true)); - final DOMEntityOwnershipCandidateRegistration candidate2 = follower1EntityOwnershipService.registerCandidate(ENTITY1); - final DOMEntityOwnershipCandidateRegistration candidate3 = follower2EntityOwnershipService.registerCandidate(ENTITY1); + final DOMEntityOwnershipCandidateRegistration candidate2 = + follower1EntityOwnershipService.registerCandidate(ENTITY1); + verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true)); + + final DOMEntityOwnershipCandidateRegistration candidate3 = + follower2EntityOwnershipService.registerCandidate(ENTITY1); + verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true)); - Mockito.reset(leaderMockListener); + Mockito.reset(leaderMockListener, follower1MockListener, follower2MockListener); - ArgumentCaptor leaderChangeCaptor = ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); - ArgumentCaptor follower1ChangeCaptor = ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); - ArgumentCaptor follower2ChangeCaptor = ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); + ArgumentCaptor leaderChangeCaptor = + ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); + ArgumentCaptor follower1ChangeCaptor = + ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); + ArgumentCaptor follower2ChangeCaptor = + ArgumentCaptor.forClass(DOMEntityOwnershipChange.class); doNothing().when(leaderMockListener).ownershipChanged(leaderChangeCaptor.capture()); doNothing().when(follower1MockListener).ownershipChanged(follower1ChangeCaptor.capture()); doNothing().when(follower2MockListener).ownershipChanged(follower2ChangeCaptor.capture()); @@ -490,17 +512,22 @@ public class DistributedEntityOwnershipIntegrationTest { candidate3.close(); boolean passed = false; - for(int i=0;i<100;i++) { + for (int i = 0; i < 100; i++) { Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); - if(!leaderEntityOwnershipService.getOwnershipState(ENTITY1).isPresent() || - leaderEntityOwnershipService.getOwnershipState(ENTITY1).get() == EntityOwnershipState.NO_OWNER && - follower1EntityOwnershipService.getOwnershipState(ENTITY1).isPresent() && - follower1EntityOwnershipService.getOwnershipState(ENTITY1).get() == EntityOwnershipState.NO_OWNER && - follower2EntityOwnershipService.getOwnershipState(ENTITY1).isPresent() && - follower2EntityOwnershipService.getOwnershipState(ENTITY1).get() == EntityOwnershipState.NO_OWNER && - leaderChangeCaptor.getAllValues().size() > 0 && !leaderChangeCaptor.getValue().getState().hasOwner() && - leaderChangeCaptor.getAllValues().size() > 0 && !follower1ChangeCaptor.getValue().getState().hasOwner() && - leaderChangeCaptor.getAllValues().size() > 0 && !follower2ChangeCaptor.getValue().getState().hasOwner()) { + final Optional leaderState = leaderEntityOwnershipService.getOwnershipState(ENTITY1); + final Optional follower1State = + follower1EntityOwnershipService.getOwnershipState(ENTITY1); + final Optional follower2State = + follower2EntityOwnershipService.getOwnershipState(ENTITY1); + final Optional leaderChange = getValueSafely(leaderChangeCaptor); + final Optional follower1Change = getValueSafely(follower1ChangeCaptor); + final Optional follower2Change = getValueSafely(follower2ChangeCaptor); + if (!leaderState.isPresent() || leaderState.get() == EntityOwnershipState.NO_OWNER + && follower1State.isPresent() && follower1State.get() == EntityOwnershipState.NO_OWNER + && follower2State.isPresent() && follower2State.get() == EntityOwnershipState.NO_OWNER + && leaderChange.isPresent() && !leaderChange.get().getState().hasOwner() + && follower1Change.isPresent() && !follower1Change.get().getState().hasOwner() + && follower2Change.isPresent() && !follower2Change.get().getState().hasOwner()) { passed = true; break; } @@ -509,29 +536,38 @@ public class DistributedEntityOwnershipIntegrationTest { assertTrue("No ownership change message was sent with hasOwner=false", passed); } + private static Optional getValueSafely(ArgumentCaptor captor) { + try { + return Optional.fromNullable(captor.getValue()); + } catch (MockitoException e) { + // No value was captured + return Optional.absent(); + } + } + /** * Tests bootstrapping the entity-ownership shard when there's no shards initially configured for local * member. The entity-ownership shard is initially created as inactive (ie remains a follower), requiring * an AddShardReplica request to join it to an existing leader. */ @Test - public void testEntityOwnershipShardBootstrapping() throws Throwable { + public void testEntityOwnershipShardBootstrapping() throws Exception { String name = "testEntityOwnershipShardBootstrapping"; String moduleShardsConfig = MODULE_SHARDS_MEMBER_1_CONFIG; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore follower1DistributedDataStore = follower1Node.configDataStore(); + AbstractDataStore follower1DistributedDataStore = follower1Node.configDataStore(); follower1DistributedDataStore.waitTillReady(); leaderNode.waitForMembersUp("member-2"); @@ -542,15 +578,18 @@ public class DistributedEntityOwnershipIntegrationTest { leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); // Register a candidate for follower1 - should get queued since follower1 has no leader - DOMEntityOwnershipCandidateRegistration candidateReg = follower1EntityOwnershipService.registerCandidate(ENTITY1); + final DOMEntityOwnershipCandidateRegistration candidateReg = + follower1EntityOwnershipService.registerCandidate(ENTITY1); Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS); verify(leaderMockListener, never()).ownershipChanged(ownershipChange(ENTITY1)); // Add replica in follower1 AddShardReplica addReplica = new AddShardReplica(ENTITY_OWNERSHIP_SHARD_NAME); - follower1DistributedDataStore.getActorContext().getShardManager().tell(addReplica , follower1Node.kit().getRef()); - Object reply = follower1Node.kit().expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), Success.class, Failure.class); - if(reply instanceof Failure) { + follower1DistributedDataStore.getActorContext().getShardManager().tell(addReplica, + follower1Node.kit().getRef()); + Object reply = follower1Node.kit().expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), + Success.class, Failure.class); + if (reply instanceof Failure) { throw new AssertionError("AddShardReplica failed", ((Failure)reply).cause()); } @@ -566,9 +605,9 @@ public class DistributedEntityOwnershipIntegrationTest { Cluster.get(leaderNode.kit().getSystem()).down(Cluster.get(follower1Node.kit().getSystem()).selfAddress()); follower1Node.cleanup(); - follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); follower1EntityOwnershipService.registerCandidate(ENTITY1); @@ -584,34 +623,36 @@ public class DistributedEntityOwnershipIntegrationTest { @Test public void testOwnerSelectedOnRapidUnregisteringAndRegisteringOfCandidates() throws Exception { - String name = "test"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + String name = "testOwnerSelectedOnRapidUnregisteringAndRegisteringOfCandidates"; + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner - DOMEntityOwnershipCandidateRegistration leaderEntity1Reg = leaderEntityOwnershipService.registerCandidate(ENTITY1); + DOMEntityOwnershipCandidateRegistration leaderEntity1Reg = + leaderEntityOwnershipService.registerCandidate(ENTITY1); verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1"); verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); @@ -625,34 +666,36 @@ public class DistributedEntityOwnershipIntegrationTest { @Test public void testOwnerSelectedOnRapidRegisteringAndUnregisteringOfCandidates() throws Exception { - String name = "test"; - MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(leaderDatastoreContextBuilder).build(); + String name = "testOwnerSelectedOnRapidRegisteringAndUnregisteringOfCandidates"; + MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(leaderDatastoreContextBuilder).build(); - MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name ). - moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false). - datastoreContextBuilder(followerDatastoreContextBuilder).build(); + MemberNode follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name) + .moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) + .datastoreContextBuilder(followerDatastoreContextBuilder).build(); - DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); + AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); leaderDistributedDataStore.waitTillReady(); follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + final DOMEntityOwnershipService follower1EntityOwnershipService = + newOwnershipService(follower1Node.configDataStore()); + newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner - DOMEntityOwnershipCandidateRegistration leaderEntity1Reg = leaderEntityOwnershipService.registerCandidate(ENTITY1); + final DOMEntityOwnershipCandidateRegistration leaderEntity1Reg = + leaderEntityOwnershipService.registerCandidate(ENTITY1); verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1"); verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); @@ -671,16 +714,18 @@ public class DistributedEntityOwnershipIntegrationTest { assertEquals("EntityOwnershipState", expState, state.get()); } - private static void verifyCandidates(final DistributedDataStore dataStore, final DOMEntity entity, final String... expCandidates) throws Exception { + private static void verifyCandidates(final AbstractDataStore dataStore, final DOMEntity entity, + final String... expCandidates) throws Exception { AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.MILLISECONDS) <= 10000) { - Optional> possible = dataStore.newReadOnlyTransaction().read( - entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME)).get(5, TimeUnit.SECONDS); + while (sw.elapsed(TimeUnit.MILLISECONDS) <= 10000) { + Optional> possible = dataStore.newReadOnlyTransaction() + .read(entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME)) + .get(5, TimeUnit.SECONDS); try { assertEquals("Candidates not found for " + entity, true, possible.isPresent()); Collection actual = new ArrayList<>(); - for(MapEntryNode candidate: ((MapNode)possible.get()).getValue()) { + for (MapEntryNode candidate: ((MapNode)possible.get()).getValue()) { actual.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString()); } @@ -695,14 +740,15 @@ public class DistributedEntityOwnershipIntegrationTest { throw lastError; } - private static void verifyOwner(final DistributedDataStore dataStore, final DOMEntity entity, final String expOwner) { - AbstractEntityOwnershipTest.verifyOwner(expOwner, entity.getType(), entity.getIdentifier(), - path -> { - try { - return dataStore.newReadOnlyTransaction().read(path).get(5, TimeUnit.SECONDS).get(); - } catch (Exception e) { - return null; - } - }); + @SuppressWarnings("checkstyle:IllegalCatch") + private static void verifyOwner(final AbstractDataStore dataStore, final DOMEntity entity, + final String expOwner) { + AbstractEntityOwnershipTest.verifyOwner(expOwner, entity.getType(), entity.getIdentifier(), path -> { + try { + return dataStore.newReadOnlyTransaction().read(path).get(5, TimeUnit.SECONDS).get(); + } catch (Exception e) { + return null; + } + }); } }