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=893ac52b05a36b418ba7ab1ee8e7688b20056278;hb=a47dd7a5d21ca68804a6d0e2e3ca765f223c2ef4;hp=25a6dc439a14b145db2be8419b295c413b57f222;hpb=a4d52d3a0781ad65b543f01b0e06ad30aa1c3a95;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 25a6dc439a..893ac52b05 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 @@ -12,8 +12,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.mockito.AdditionalMatchers.or; -import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; @@ -22,14 +22,15 @@ 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; import akka.cluster.Cluster; import akka.testkit.JavaTestKit; -import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Stopwatch; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; import java.util.ArrayList; import java.util.Arrays; @@ -45,23 +46,23 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; 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.MemberNode.RaftStateVerifier; import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; import org.opendaylight.controller.cluster.datastore.messages.AddShardReplica; -import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; +import org.opendaylight.controller.cluster.raft.RaftState; +import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; -import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException; -import org.opendaylight.controller.md.sal.common.api.clustering.Entity; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipChange; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService; -import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; +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; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipChange; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.clustering.entity.owners.rev150804.entity.owners.entity.type.entity.Candidate; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -74,14 +75,15 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public class DistributedEntityOwnershipIntegrationTest { private static final String MODULE_SHARDS_CONFIG = "module-shards-default.conf"; + private static final String MODULE_SHARDS_5_NODE_CONFIG = "module-shards-default-5-node.conf"; private static final String MODULE_SHARDS_MEMBER_1_CONFIG = "module-shards-default-member-1.conf"; private static final String ENTITY_TYPE1 = "entityType1"; private static final String ENTITY_TYPE2 = "entityType2"; - private static final Entity ENTITY1 = new Entity(ENTITY_TYPE1, "entity1"); - private static final Entity ENTITY1_2 = new Entity(ENTITY_TYPE2, "entity1"); - private static final Entity ENTITY2 = new Entity(ENTITY_TYPE1, "entity2"); - private static final Entity ENTITY3 = new Entity(ENTITY_TYPE1, "entity3"); - private static final Entity ENTITY4 = new Entity(ENTITY_TYPE1, "entity4"); + private static final DOMEntity ENTITY1 = new DOMEntity(ENTITY_TYPE1, "entity1"); + private static final DOMEntity ENTITY1_2 = new DOMEntity(ENTITY_TYPE2, "entity1"); + private static final DOMEntity ENTITY2 = new DOMEntity(ENTITY_TYPE1, "entity2"); + private static final DOMEntity ENTITY3 = new DOMEntity(ENTITY_TYPE1, "entity3"); + private static final DOMEntity ENTITY4 = new DOMEntity(ENTITY_TYPE1, "entity4"); private static final SchemaContext SCHEMA_CONTEXT = SchemaContextHelper.entityOwners(); private final DatastoreContext.Builder leaderDatastoreContextBuilder = @@ -94,16 +96,16 @@ public class DistributedEntityOwnershipIntegrationTest { private final List memberNodes = new ArrayList<>(); @Mock - private EntityOwnershipListener leaderMockListener; + private DOMEntityOwnershipListener leaderMockListener; @Mock - private EntityOwnershipListener leaderMockListener2; + private DOMEntityOwnershipListener leaderMockListener2; @Mock - private EntityOwnershipListener follower1MockListener; + private DOMEntityOwnershipListener follower1MockListener; @Mock - private EntityOwnershipListener follower2MockListener; + private DOMEntityOwnershipListener follower2MockListener; @Before public void setUp() { @@ -114,16 +116,15 @@ public class DistributedEntityOwnershipIntegrationTest { @After public void tearDown() { - for(MemberNode m: memberNodes) { + for (MemberNode m : Lists.reverse(memberNodes)) { m.cleanup(); } + memberNodes.clear(); } - private DistributedEntityOwnershipService newOwnershipService(DistributedDataStore datastore) { - DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(datastore, + private static DistributedEntityOwnershipService newOwnershipService(final DistributedDataStore datastore) { + return DistributedEntityOwnershipService.start(datastore.getActorContext(), EntityOwnerSelectionStrategyConfig.newBuilder().build()); - service.start(); - return service; } @Test @@ -147,9 +148,9 @@ public class DistributedEntityOwnershipIntegrationTest { follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - EntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - EntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - EntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); + DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -164,14 +165,15 @@ public class DistributedEntityOwnershipIntegrationTest { verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true)); reset(leaderMockListener, follower1MockListener); - verifyGetOwnershipState(leaderEntityOwnershipService, ENTITY1, true, true); - verifyGetOwnershipState(follower1EntityOwnershipService, ENTITY1, false, true); + verifyGetOwnershipState(leaderEntityOwnershipService, ENTITY1, EntityOwnershipState.IS_OWNER); + verifyGetOwnershipState(follower1EntityOwnershipService, ENTITY1, EntityOwnershipState.OWNED_BY_OTHER); // Register leader candidate for entity1_2 (same id, different type) and verify it becomes owner leaderEntityOwnershipService.registerCandidate(ENTITY1_2); verify(leaderMockListener2, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1_2, false, true, true)); - verify(leaderMockListener, timeout(300).never()).ownershipChanged(ownershipChange(ENTITY1_2)); + Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS); + verify(leaderMockListener, never()).ownershipChanged(ownershipChange(ENTITY1_2)); reset(leaderMockListener2); // Register follower1 candidate for entity1 and verify it gets added but doesn't become owner @@ -179,12 +181,13 @@ public class DistributedEntityOwnershipIntegrationTest { follower1EntityOwnershipService.registerCandidate(ENTITY1); verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1", "member-2"); verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); - verify(leaderMockListener, timeout(300).never()).ownershipChanged(ownershipChange(ENTITY1)); - verify(follower1MockListener, timeout(300).never()).ownershipChanged(ownershipChange(ENTITY1)); + 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 - EntityOwnershipCandidateRegistration follower1Entity2Reg = follower1EntityOwnershipService.registerCandidate(ENTITY2); + 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)); reset(leaderMockListener, follower1MockListener); @@ -192,6 +195,9 @@ public class DistributedEntityOwnershipIntegrationTest { // 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)); + follower2EntityOwnershipService.registerCandidate(ENTITY2); verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-2", "member-3"); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-2"); @@ -208,7 +214,6 @@ public class DistributedEntityOwnershipIntegrationTest { // if the original ownership change with "member-2 is replicated to follower2 after the listener is // registered. Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); - verify(follower2MockListener, atMost(1)).ownershipChanged(ownershipChange(ENTITY2, false, false, true)); verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); // Register follower1 candidate for entity3 and verify it becomes owner @@ -247,7 +252,7 @@ public class DistributedEntityOwnershipIntegrationTest { // Register leader candidate for entity2 and verify it becomes owner - EntityOwnershipCandidateRegistration leaderEntity2Reg = leaderEntityOwnershipService.registerCandidate(ENTITY2); + DOMEntityOwnershipCandidateRegistration leaderEntity2Reg = leaderEntityOwnershipService.registerCandidate(ENTITY2); verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true)); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); @@ -259,6 +264,176 @@ public class DistributedEntityOwnershipIntegrationTest { verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, false, false)); } + @Test + public void testLeaderCandidatesRemovedAfterShutdown() 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(); + + 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(); + + DistributedDataStore 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()); + + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + + // Register follower1 candidate for entity1 and verify it becomes owner + + follower1EntityOwnershipService.registerCandidate(ENTITY1); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + + // Register leader candidate for entity1 + + leaderEntityOwnershipService.registerCandidate(ENTITY1); + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-2", "member-1"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + + // Register leader candidate for entity2 and verify it becomes owner + + leaderEntityOwnershipService.registerCandidate(ENTITY2); + verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); + + // Register follower2 candidate for entity2 + + follower2EntityOwnershipService.registerCandidate(ENTITY2); + verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3"); + verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); + + // Shutdown the leader and verify its removed from the candidate list + + leaderNode.cleanup(); + follower1Node.waitForMemberDown("member-1"); + + // 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()); + + 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 + + verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2"); + verifyCandidates(follower1Node.configDataStore(), ENTITY2, "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(); + + 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()); + + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + + // Register follower1 candidate for entity1 and verify it becomes owner + + follower1EntityOwnershipService.registerCandidate(ENTITY1); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + + // Register leader candidate for entity1 + + leaderEntityOwnershipService.registerCandidate(ENTITY1); + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-2", "member-1"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + + // Register leader candidate for entity2 and verify it becomes owner + + leaderEntityOwnershipService.registerCandidate(ENTITY2); + verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); + + // Register follower2 candidate for entity2 + + follower2EntityOwnershipService.registerCandidate(ENTITY2); + verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3"); + verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); + + // Register follower3 as a candidate for entity2 as well + + follower3EntityOwnershipService.registerCandidate(ENTITY2); + 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 + + leaderNode.cleanup(); + follower3Node.cleanup(); + + follower1Node.waitForMemberDown("member-1"); + follower1Node.waitForMemberDown("member-4"); + + // 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()); + + MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, + raftState -> assertEquals("Raft state", RaftState.Leader.toString(), raftState.getRaftState())); + + // Verify the prior leader's and follower3 candidates are removed + + verifyCandidates(follower1Node.configDataStore(), ENTITY1, "member-2"); + verifyCandidates(follower1Node.configDataStore(), ENTITY2, "member-3"); + verifyOwner(follower1Node.configDataStore(), ENTITY1, "member-2"); + verifyOwner(follower1Node.configDataStore(), ENTITY2, "member-3"); + } + /** * Reproduces bug 4554 * @@ -285,9 +460,9 @@ public class DistributedEntityOwnershipIntegrationTest { follower1Node.configDataStore().waitTillReady(); follower2Node.configDataStore().waitTillReady(); - EntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - EntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); - EntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); + DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore()); + DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -295,17 +470,17 @@ public class DistributedEntityOwnershipIntegrationTest { follower1EntityOwnershipService.registerListener(ENTITY_TYPE1, follower1MockListener); follower2EntityOwnershipService.registerListener(ENTITY_TYPE1, follower2MockListener); - final EntityOwnershipCandidateRegistration candidate1 = leaderEntityOwnershipService.registerCandidate(ENTITY1); - final EntityOwnershipCandidateRegistration candidate2 = follower1EntityOwnershipService.registerCandidate(ENTITY1); - final EntityOwnershipCandidateRegistration candidate3 = follower2EntityOwnershipService.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); + Mockito.reset(leaderMockListener); - ArgumentCaptor leaderChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class); - ArgumentCaptor follower1ChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class); - ArgumentCaptor follower2ChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.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()); @@ -317,12 +492,15 @@ public class DistributedEntityOwnershipIntegrationTest { boolean passed = false; for(int i=0;i<100;i++) { Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); - if(!leaderEntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && - !follower1EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && - !follower2EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() && - leaderChangeCaptor.getAllValues().size() > 0 && !leaderChangeCaptor.getValue().hasOwner() && - leaderChangeCaptor.getAllValues().size() > 0 && !follower1ChangeCaptor.getValue().hasOwner() && - leaderChangeCaptor.getAllValues().size() > 0 && !follower2ChangeCaptor.getValue().hasOwner()) { + 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()) { passed = true; break; } @@ -345,7 +523,7 @@ public class DistributedEntityOwnershipIntegrationTest { datastoreContextBuilder(leaderDatastoreContextBuilder).build(); DistributedDataStore leaderDistributedDataStore = leaderNode.configDataStore(); - EntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); + DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); @@ -359,13 +537,14 @@ public class DistributedEntityOwnershipIntegrationTest { leaderNode.waitForMembersUp("member-2"); follower1Node.waitForMembersUp("member-1"); - EntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1DistributedDataStore); + DOMEntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1DistributedDataStore); leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); // Register a candidate for follower1 - should get queued since follower1 has no leader - EntityOwnershipCandidateRegistration candidateReg = follower1EntityOwnershipService.registerCandidate(ENTITY1); - verify(leaderMockListener, timeout(300).never()).ownershipChanged(ownershipChange(ENTITY1)); + 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); @@ -395,31 +574,109 @@ public class DistributedEntityOwnershipIntegrationTest { follower1EntityOwnershipService.registerCandidate(ENTITY1); verify(leaderMockListener, timeout(20000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true)); - verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, new RaftStateVerifier() { - @Override - public void verify(OnDemandRaftState raftState) { - assertNull("Custom RaftPolicy class name", raftState.getCustomRaftPolicyClassName()); - assertEquals("Peer count", 1, raftState.getPeerAddresses().keySet().size()); - assertThat("Peer Id", Iterables.getLast(raftState.getPeerAddresses().keySet()), - org.hamcrest.CoreMatchers.containsString("member-1")); - } + verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, raftState -> { + assertNull("Custom RaftPolicy class name", raftState.getCustomRaftPolicyClassName()); + assertEquals("Peer count", 1, raftState.getPeerAddresses().keySet().size()); + assertThat("Peer Id", Iterables.getLast(raftState.getPeerAddresses().keySet()), + org.hamcrest.CoreMatchers.containsString("member-1")); }); } - private static void verifyGetOwnershipState(EntityOwnershipService service, Entity entity, - boolean isOwner, boolean hasOwner) { + @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(); + + 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(); + + DistributedDataStore 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()); + + 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); + + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); + + leaderEntity1Reg.close(); + follower1EntityOwnershipService.registerCandidate(ENTITY1); + + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-2"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + } + + @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(); + + 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(); + + DistributedDataStore 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()); + + 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); + + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1"); + + follower1EntityOwnershipService.registerCandidate(ENTITY1); + leaderEntity1Reg.close(); + + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-2"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); + } + + private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity, + final EntityOwnershipState expState) { Optional state = service.getOwnershipState(entity); assertEquals("getOwnershipState present", true, state.isPresent()); - assertEquals("isOwner", isOwner, state.get().isOwner()); - assertEquals("hasOwner", hasOwner, state.get().hasOwner()); + assertEquals("EntityOwnershipState", expState, state.get()); } - private static void verifyCandidates(DistributedDataStore dataStore, Entity entity, String... expCandidates) throws Exception { + private static void verifyCandidates(final DistributedDataStore dataStore, final DOMEntity entity, final String... expCandidates) throws Exception { AssertionError lastError = null; Stopwatch sw = Stopwatch.createStarted(); - while(sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { + while(sw.elapsed(TimeUnit.MILLISECONDS) <= 10000) { Optional> possible = dataStore.newReadOnlyTransaction().read( - entityPath(entity.getType(), entity.getId()).node(Candidate.QNAME)).get(5, TimeUnit.SECONDS); + 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<>(); @@ -438,16 +695,13 @@ public class DistributedEntityOwnershipIntegrationTest { throw lastError; } - private static void verifyOwner(final DistributedDataStore dataStore, Entity entity, String expOwner) { - AbstractEntityOwnershipTest.verifyOwner(expOwner, entity.getType(), entity.getId(), - new Function>() { - @Override - public NormalizedNode apply(YangInstanceIdentifier path) { - try { - return dataStore.newReadOnlyTransaction().read(path).get(5, TimeUnit.SECONDS).get(); - } catch (Exception e) { - return null; - } + 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; } }); }