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%2FEntityOwnershipShardTest.java;h=26811444d843c11220c03fdc99dcbc2b1ff960c6;hb=c796596b5c46b5203c30b143e6282662e66c5642;hp=1e21329c3812c63fe2514eb321b50f055ccc4ae6;hpb=e970feb618c5e3793454f7f1a3974797a61c7c17;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java index 1e21329c38..26811444d8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardTest.java @@ -14,6 +14,7 @@ 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.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNERS_PATH; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.candidatePath; @@ -38,6 +39,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.junit.After; import org.junit.Test; +import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.AbstractShardTest; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; import org.opendaylight.controller.cluster.datastore.DatastoreContext; @@ -48,6 +50,8 @@ import org.opendaylight.controller.cluster.datastore.entityownership.messages.Re import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterListenerLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterListenerLocal; +import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; +import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.LastCandidateSelectionStrategy; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications; import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply; @@ -108,7 +112,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); YangInstanceIdentifier entityId = ENTITY_ID1; Entity entity = new Entity(ENTITY_TYPE, entityId); @@ -167,7 +171,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { ImmutableMap.builder().put(peerId, peer.path().toString()).build()). withDispatcher(Dispatchers.DefaultDispatcherId())); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); YangInstanceIdentifier entityId = ENTITY_ID1; Entity entity = new Entity(ENTITY_TYPE, entityId); @@ -203,7 +207,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { ImmutableMap.builder().put(peerId, peer.path().toString()).build()). withDispatcher(Dispatchers.DefaultDispatcherId())); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); // Drop AppendEntries and wait enough time for the shard to switch to IsolatedLeader. follower.dropAppendEntries = true; @@ -295,7 +299,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testOnUnregisterCandidateLocal() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); @@ -327,7 +331,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testOwnershipChanges() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); @@ -404,24 +408,24 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef peer1 = actorFactory.createTestActor(newShardProps(peerId1, ImmutableMap.builder().put(leaderId.toString(), ""). put(peerId2.toString(), "").build(), - peerMemberName1).withDispatcher(Dispatchers.DefaultDispatcherId()), peerId1.toString()); + peerMemberName1, EntityOwnerSelectionStrategyConfig.newBuilder().build()).withDispatcher(Dispatchers.DefaultDispatcherId()), peerId1.toString()); TestActorRef peer2 = actorFactory.createTestActor(newShardProps(peerId2, ImmutableMap.builder().put(leaderId.toString(), ""). put(peerId1.toString(), "").build(), - peerMemberName2). withDispatcher(Dispatchers.DefaultDispatcherId()), peerId2.toString()); + peerMemberName2, EntityOwnerSelectionStrategyConfig.newBuilder().build()). withDispatcher(Dispatchers.DefaultDispatcherId()), peerId2.toString()); TestActorRef leader = actorFactory.createTestActor(newShardProps(leaderId, ImmutableMap.builder().put(peerId1.toString(), peer1.path().toString()). - put(peerId2.toString(), peer2.path().toString()).build(), LOCAL_MEMBER_NAME). + put(peerId2.toString(), peer2.path().toString()).build(), LOCAL_MEMBER_NAME, EntityOwnerSelectionStrategyConfig.newBuilder().build()). withDispatcher(Dispatchers.DefaultDispatcherId()), leaderId.toString()); - leader.tell(new ElectionTimeout(), leader); + leader.tell(ElectionTimeout.INSTANCE, leader); - kit.waitUntilLeader(leader); + ShardTestKit.waitUntilLeader(leader); // Send PeerDown and PeerUp with no entities - leader.tell(new PeerDown(peerMemberName2, peerId2.toString()), ActorRef.noSender()); - leader.tell(new PeerUp(peerMemberName2, peerId2.toString()), ActorRef.noSender()); + leader.tell(new PeerDown(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); + leader.tell(new PeerUp(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); // Add candidates for entity1 with the local leader as the owner @@ -478,10 +482,10 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { kit.expectMsgClass(JavaTestKit.duration("5 seconds"), Terminated.class); kit.unwatch(peer2); - leader.tell(new PeerDown(peerMemberName2, peerId2.toString()), ActorRef.noSender()); + leader.tell(new PeerDown(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); // Send PeerDown again - should be noop - leader.tell(new PeerDown(peerMemberName2, peerId2.toString()), ActorRef.noSender()); - peer1.tell(new PeerDown(peerMemberName2, peerId2.toString()), ActorRef.noSender()); + leader.tell(new PeerDown(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); + peer1.tell(new PeerDown(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID4, ""); // no other candidates so should clear verifyOwner(leader, ENTITY_TYPE, ENTITY_ID3, LOCAL_MEMBER_NAME); @@ -497,11 +501,11 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { peer2 = actorFactory.createTestActor(newShardProps(peerId2, ImmutableMap.builder().put(leaderId.toString(), ""). put(peerId1.toString(), "").build(), - peerMemberName2). withDispatcher(Dispatchers.DefaultDispatcherId()), peerId2.toString()); - leader.tell(new PeerUp(peerMemberName2, peerId2.toString()), ActorRef.noSender()); + peerMemberName2, EntityOwnerSelectionStrategyConfig.newBuilder().build()). withDispatcher(Dispatchers.DefaultDispatcherId()), peerId2.toString()); + leader.tell(new PeerUp(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); // Send PeerUp again - should be noop - leader.tell(new PeerUp(peerMemberName2, peerId2.toString()), ActorRef.noSender()); - peer1.tell(new PeerUp(peerMemberName2, peerId2.toString()), ActorRef.noSender()); + leader.tell(new PeerUp(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); + peer1.tell(new PeerUp(peerId2.getMemberName(), peerId2.toString()), ActorRef.noSender()); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID3, LOCAL_MEMBER_NAME); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID2, peerMemberName1); @@ -523,7 +527,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { // Kill peerMember1 and send PeerDown - entity 2 should get a new owner selected peer1.tell(PoisonPill.getInstance(), ActorRef.noSender()); - leader.tell(new PeerDown(peerMemberName1, peerId1.toString()), ActorRef.noSender()); + leader.tell(new PeerDown(peerId1.getMemberName(), peerId1.toString()), ActorRef.noSender()); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID2, peerMemberName2); @@ -538,8 +542,8 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { peer1 = actorFactory.createTestActor(newShardProps(peerId1, ImmutableMap.builder().put(leaderId.toString(), ""). put(peerId2.toString(), "").build(), - peerMemberName1).withDispatcher(Dispatchers.DefaultDispatcherId()), peerId1.toString()); - leader.tell(new PeerUp(peerMemberName1, peerId1.toString()), ActorRef.noSender()); + peerMemberName1, EntityOwnerSelectionStrategyConfig.newBuilder().build()).withDispatcher(Dispatchers.DefaultDispatcherId()), peerId1.toString()); + leader.tell(new PeerUp(peerId1.getMemberName(), peerId1.toString()), ActorRef.noSender()); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID4, ""); verifyOwner(leader, ENTITY_TYPE, ENTITY_ID3, LOCAL_MEMBER_NAME); @@ -557,14 +561,14 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { // the entities (1 and 3) previously owned by the local leader member. peer2.tell(new PeerAddressResolved(peerId1.toString(), peer1.path().toString()), ActorRef.noSender()); - peer2.tell(new PeerUp(LOCAL_MEMBER_NAME, leaderId.toString()), ActorRef.noSender()); - peer2.tell(new PeerUp(peerMemberName1, peerId1.toString()), ActorRef.noSender()); + peer2.tell(new PeerUp(leaderId.getMemberName(), leaderId.toString()), ActorRef.noSender()); + peer2.tell(new PeerUp(peerId1.getMemberName(), peerId1.toString()), ActorRef.noSender()); leader.tell(PoisonPill.getInstance(), ActorRef.noSender()); - peer2.tell(new PeerDown(LOCAL_MEMBER_NAME, leaderId.toString()), ActorRef.noSender()); - peer2.tell(new ElectionTimeout(), peer2); + peer2.tell(new PeerDown(leaderId.getMemberName(), leaderId.toString()), ActorRef.noSender()); + peer2.tell(ElectionTimeout.INSTANCE, peer2); - kit.waitUntilLeader(peer2); + ShardTestKit.waitUntilLeader(peer2); verifyOwner(peer2, ENTITY_TYPE, ENTITY_ID4, ""); verifyOwner(peer2, ENTITY_TYPE, ENTITY_ID3, peerMemberName2); @@ -587,10 +591,10 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { TestActorRef leader = actorFactory.createTestActor(newShardProps(leaderId, ImmutableMap.builder().put(localId.toString(), shard.path().toString()).build(), - LOCAL_MEMBER_NAME).withDispatcher(Dispatchers.DefaultDispatcherId()), leaderId.toString()); - leader.tell(new ElectionTimeout(), leader); + LOCAL_MEMBER_NAME, EntityOwnerSelectionStrategyConfig.newBuilder().build()).withDispatcher(Dispatchers.DefaultDispatcherId()), leaderId.toString()); + leader.tell(ElectionTimeout.INSTANCE, leader); - kit.waitUntilLeader(leader); + ShardTestKit.waitUntilLeader(leader); shard.tell(new PeerAddressResolved(leaderId.toString(), leader.path().toString()), ActorRef.noSender()); @@ -611,7 +615,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { // Simulate a replicated commit from the leader to remove the local candidate that would occur after a // network partition is healed. - leader.tell(new PeerDown(LOCAL_MEMBER_NAME, localId.toString()), ActorRef.noSender()); + leader.tell(new PeerDown(localId.getMemberName(), localId.toString()), ActorRef.noSender()); verify(listener, timeout(5000)).ownershipChanged(ownershipChange(entity, true, false, false)); @@ -634,7 +638,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { public void testListenerRegistration() throws Exception { ShardTestKit kit = new ShardTestKit(getSystem()); TestActorRef shard = actorFactory.createTestActor(newShardProps()); - kit.waitUntilLeader(shard); + ShardTestKit.waitUntilLeader(shard); ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); String otherEntityType = "otherEntityType"; @@ -708,7 +712,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { ownershipChange(entity3, false, true, true))); Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS); verify(listener, never()).ownershipChanged(ownershipChange(entity4)); - verify(listener, never()).ownershipChanged(ownershipChange(entity1)); + verify(listener, times(1)).ownershipChanged(ownershipChange(entity1)); } private static void commitModification(TestActorRef shard, NormalizedNode node, @@ -717,7 +721,7 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { modifications.addModification(new MergeModification(ENTITY_OWNERS_PATH, node)); shard.tell(modifications, sender.getRef()); - sender.expectMsgClass(CommitTransactionReply.SERIALIZABLE_CLASS); + sender.expectMsgClass(CommitTransactionReply.class); } private static BatchedModifications newBatchedModifications() { @@ -802,40 +806,44 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { return newShardProps(Collections.emptyMap()); } - private Props newShardProps(Map peers) { - return newShardProps(newShardId(LOCAL_MEMBER_NAME), peers, LOCAL_MEMBER_NAME); + private Props newShardProps(EntityOwnerSelectionStrategyConfig strategyConfig, Map peers) { + return newShardProps(newShardId(LOCAL_MEMBER_NAME), peers, LOCAL_MEMBER_NAME, strategyConfig); } - private Props newShardProps(ShardIdentifier shardId, Map peers, String memberName) { + private Props newShardProps(Map peers) { + return newShardProps(newShardId(LOCAL_MEMBER_NAME), peers, LOCAL_MEMBER_NAME, EntityOwnerSelectionStrategyConfig.newBuilder().build()); + } + + private Props newShardProps(ShardIdentifier shardId, Map peers, String memberName, + EntityOwnerSelectionStrategyConfig config) { return EntityOwnershipShard.newBuilder().id(shardId).peerAddresses(peers). datastoreContext(dataStoreContextBuilder.build()).schemaContext(SCHEMA_CONTEXT). - localMemberName(memberName).props().withDispatcher(Dispatchers.DefaultDispatcherId()); + localMemberName(MemberName.forName(memberName)).ownerSelectionStrategyConfig(config).props() + .withDispatcher(Dispatchers.DefaultDispatcherId()); } private static ShardIdentifier newShardId(String memberName) { - return ShardIdentifier.builder().memberName(memberName).shardName("entity-ownership"). - type("operational" + NEXT_SHARD_NUM.getAndIncrement()).build(); + return ShardIdentifier.create("entity-ownership", MemberName.forName(memberName), + "operational" + NEXT_SHARD_NUM.getAndIncrement()); } - public static class TestEntityOwnershipShard extends EntityOwnershipShard { + private static class TestEntityOwnershipShard extends EntityOwnershipShard { TestEntityOwnershipShard(ShardIdentifier name, Map peerAddresses, DatastoreContext datastoreContext) { super(newBuilder().id(name).peerAddresses(peerAddresses).datastoreContext(datastoreContext). - schemaContext(SCHEMA_CONTEXT).localMemberName(LOCAL_MEMBER_NAME)); + schemaContext(SCHEMA_CONTEXT).localMemberName(MemberName.forName(LOCAL_MEMBER_NAME))); } @Override - public void onReceiveCommand(Object message) throws Exception { + public void handleCommand(Object message) { if(!(message instanceof ElectionTimeout)) { - super.onReceiveCommand(message); + super.handleCommand(message); } } - - } - public static class MockFollower extends UntypedActor { + private static class MockFollower extends UntypedActor { volatile boolean grantVote; volatile boolean dropAppendEntries; private final String myId; @@ -872,7 +880,87 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { } } - public static class MockLeader extends UntypedActor { + + @Test + public void testDelayedEntityOwnerSelectionWhenMaxPeerRequestsReceived() throws Exception { + ShardTestKit kit = new ShardTestKit(getSystem()); + EntityOwnerSelectionStrategyConfig.Builder builder + = EntityOwnerSelectionStrategyConfig.newBuilder().addStrategy(ENTITY_TYPE, LastCandidateSelectionStrategy.class, 500); + + String peerId = newShardId("follower").toString(); + TestActorRef peer = actorFactory.createTestActor(Props.create(MockFollower.class, peerId, false). + withDispatcher(Dispatchers.DefaultDispatcherId()), peerId); + + peer.underlyingActor().grantVote = true; + + TestActorRef shard = actorFactory.createTestActor(newShardProps(builder.build(), + ImmutableMap.of(peerId.toString(), peer.path().toString()))); + ShardTestKit.waitUntilLeader(shard); + + Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); + ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); + + // Add a remote candidate + + String remoteMemberName1 = "follower"; + writeNode(ENTITY_OWNERS_PATH, entityOwnersWithCandidate(ENTITY_TYPE, ENTITY_ID1, remoteMemberName1), shardDataTree); + + // Register local + + shard.tell(new RegisterCandidateLocal(entity), kit.getRef()); + kit.expectMsgClass(SuccessReply.class); + + // Verify the local candidate becomes owner + + verifyCommittedEntityCandidate(shard, ENTITY_TYPE, ENTITY_ID1, remoteMemberName1); + verifyCommittedEntityCandidate(shard, ENTITY_TYPE, ENTITY_ID1, LOCAL_MEMBER_NAME); + verifyOwner(shard, ENTITY_TYPE, ENTITY_ID1, LOCAL_MEMBER_NAME); + } + + @Test + public void testDelayedEntityOwnerSelection() throws Exception { + ShardTestKit kit = new ShardTestKit(getSystem()); + EntityOwnerSelectionStrategyConfig.Builder builder + = EntityOwnerSelectionStrategyConfig.newBuilder().addStrategy(ENTITY_TYPE, LastCandidateSelectionStrategy.class, 500); + + String follower1Id = newShardId("follower1").toString(); + TestActorRef follower1 = actorFactory.createTestActor(Props.create(MockFollower.class, follower1Id, false). + withDispatcher(Dispatchers.DefaultDispatcherId()), follower1Id); + + follower1.underlyingActor().grantVote = true; + + String follower2Id = newShardId("follower").toString(); + TestActorRef follower2 = actorFactory.createTestActor(Props.create(MockFollower.class, follower2Id, false). + withDispatcher(Dispatchers.DefaultDispatcherId()), follower2Id); + + follower2.underlyingActor().grantVote = true; + + + TestActorRef shard = actorFactory.createTestActor(newShardProps(builder.build(), + ImmutableMap.of(follower1Id.toString(), follower2.path().toString(), follower2Id.toString(), follower2.path().toString()))); + ShardTestKit.waitUntilLeader(shard); + + Entity entity = new Entity(ENTITY_TYPE, ENTITY_ID1); + ShardDataTree shardDataTree = shard.underlyingActor().getDataStore(); + + // Add a remote candidate + + String remoteMemberName1 = "follower"; + writeNode(ENTITY_OWNERS_PATH, entityOwnersWithCandidate(ENTITY_TYPE, ENTITY_ID1, remoteMemberName1), shardDataTree); + + // Register local + + shard.tell(new RegisterCandidateLocal(entity), kit.getRef()); + kit.expectMsgClass(SuccessReply.class); + + // Verify the local candidate becomes owner + + verifyCommittedEntityCandidate(shard, ENTITY_TYPE, ENTITY_ID1, remoteMemberName1); + verifyCommittedEntityCandidate(shard, ENTITY_TYPE, ENTITY_ID1, LOCAL_MEMBER_NAME); + verifyOwner(shard, ENTITY_TYPE, ENTITY_ID1, LOCAL_MEMBER_NAME); + } + + private static class MockLeader extends UntypedActor { volatile CountDownLatch modificationsReceived = new CountDownLatch(1); List receivedModifications = new ArrayList<>(); volatile boolean sendReply = true; @@ -894,7 +982,8 @@ public class EntityOwnershipShardTest extends AbstractEntityOwnershipTest { } } - getSender().tell(CommitTransactionReply.INSTANCE.toSerializable(), getSelf()); + getSender().tell(CommitTransactionReply.instance(DataStoreVersions.CURRENT_VERSION). + toSerializable(), getSelf()); } else { sendReply = true; }