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=d040eb6cdef7353e02ae029351890518ff1c23d5;hb=20a32e6459fd1e27e7669bf1ebc7742b96787b94;hp=aaf4bc2de99e22ea041d9964a84bcff973ce06d9;hpb=af7843cb8ff928e5cce9fbd94afd441cdf857dde;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 aaf4bc2de9..d040eb6cde 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 @@ -27,9 +27,12 @@ import akka.actor.ActorRef; import akka.actor.Status.Failure; import akka.actor.Status.Success; import akka.cluster.Cluster; +import akka.pattern.Patterns; import akka.testkit.JavaTestKit; +import akka.util.Timeout; import com.google.common.base.Optional; import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; @@ -38,7 +41,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicLong; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -53,7 +55,7 @@ import org.opendaylight.controller.cluster.datastore.IntegrationTestKit; import org.opendaylight.controller.cluster.datastore.MemberNode; import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; import org.opendaylight.controller.cluster.datastore.messages.AddShardReplica; -import org.opendaylight.controller.cluster.raft.RaftState; +import org.opendaylight.controller.cluster.datastore.messages.ChangeShardMembersVotingStatus; import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; @@ -69,6 +71,9 @@ 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; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import scala.concurrent.Await; +import scala.concurrent.Future; +import scala.concurrent.duration.FiniteDuration; /** * End-to-end integration tests for the entity ownership functionality. @@ -325,32 +330,23 @@ public class DistributedEntityOwnershipIntegrationTest { verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3"); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); - // Get the leader's lastIndex and verify followers are fully synced before shutting down the leader + // Re-enable elections on all remaining followers so one becomes the new leader - AtomicLong leaderLastIndex = new AtomicLong(); - MemberNode.verifyRaftState(leaderDistributedDataStore, ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> leaderLastIndex.set(raftState.getLastIndex())); - - MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - MemberNode.verifyRaftState(follower2Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); // 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())); + follower2Node.waitForMemberDown("member-1"); // Verify the prior leader's entity owners are re-assigned. @@ -441,19 +437,22 @@ public class DistributedEntityOwnershipIntegrationTest { verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3", "member-4"); verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1"); - // Get the leader's lastIndex and verify followers are fully synced before shutting down the leader - AtomicLong leaderLastIndex = new AtomicLong(); - MemberNode.verifyRaftState(leaderDistributedDataStore, ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> leaderLastIndex.set(raftState.getLastIndex())); + // Re-enable elections on all remaining followers so one becomes the new leader - MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - MemberNode.verifyRaftState(follower2Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - MemberNode.verifyRaftState(follower4Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, - raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + follower4Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) + .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); // Shutdown the leader and follower3 @@ -462,16 +461,10 @@ public class DistributedEntityOwnershipIntegrationTest { 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())); + follower2Node.waitForMemberDown("member-1"); + follower2Node.waitForMemberDown("member-4"); + follower4Node.waitForMemberDown("member-1"); + follower4Node.waitForMemberDown("member-4"); // Verify the prior leader's and follower3 entity owners are re-assigned. @@ -741,6 +734,108 @@ public class DistributedEntityOwnershipIntegrationTest { verifyOwner(leaderDistributedDataStore, ENTITY1, "member-2"); } + @Test + public void testEntityOwnershipWithNonVotingMembers() throws Exception { + followerDatastoreContextBuilder.shardElectionTimeoutFactor(5) + .customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName()); + + String name = "testEntityOwnershipWithNonVotingMembers"; + final MemberNode member1LeaderNode = 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 member2FollowerNode = 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 member3FollowerNode = 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 member4FollowerNode = 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 member5FollowerNode = 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 = member1LeaderNode.configDataStore(); + + leaderDistributedDataStore.waitTillReady(); + member2FollowerNode.configDataStore().waitTillReady(); + member3FollowerNode.configDataStore().waitTillReady(); + member4FollowerNode.configDataStore().waitTillReady(); + member5FollowerNode.configDataStore().waitTillReady(); + + member1LeaderNode.waitForMembersUp("member-2", "member-3", "member-4", "member-5"); + + final DOMEntityOwnershipService member3EntityOwnershipService = + newOwnershipService(member3FollowerNode.configDataStore()); + final DOMEntityOwnershipService member4EntityOwnershipService = + newOwnershipService(member4FollowerNode.configDataStore()); + final DOMEntityOwnershipService member5EntityOwnershipService = + newOwnershipService(member5FollowerNode.configDataStore()); + + newOwnershipService(member1LeaderNode.configDataStore()); + member1LeaderNode.kit().waitUntilLeader(member1LeaderNode.configDataStore().getActorContext(), + ENTITY_OWNERSHIP_SHARD_NAME); + + // Make member4 and member5 non-voting + + Future future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(), + new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, + ImmutableMap.of("member-4", false, "member-5", false)), new Timeout(10, TimeUnit.SECONDS)); + Object response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS)); + if (response instanceof Throwable) { + throw new AssertionError("ChangeShardMembersVotingStatus failed", (Throwable)response); + } + + assertNull("Expected null Success response. Actual " + response, response); + + // Register member4 candidate for entity1 - it should not become owner since it's non-voting + + member4EntityOwnershipService.registerCandidate(ENTITY1); + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-4"); + + // Register member5 candidate for entity2 - it should not become owner since it's non-voting + + member5EntityOwnershipService.registerCandidate(ENTITY2); + verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-5"); + + Uninterruptibles.sleepUninterruptibly(500, TimeUnit.MILLISECONDS); + verifyOwner(leaderDistributedDataStore, ENTITY1, ""); + verifyOwner(leaderDistributedDataStore, ENTITY2, ""); + + // Register member3 candidate for entity1 - it should become owner since it's voting + + member3EntityOwnershipService.registerCandidate(ENTITY1); + verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-4", "member-3"); + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-3"); + + // Switch member4 and member5 back to voting and member3 non-voting. This should result in member4 and member5 + // to become entity owners. + + future = Patterns.ask(leaderDistributedDataStore.getActorContext().getShardManager(), + new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, + ImmutableMap.of("member-3", false, "member-4", true, "member-5", true)), + new Timeout(10, TimeUnit.SECONDS)); + response = Await.result(future, FiniteDuration.apply(10, TimeUnit.SECONDS)); + if (response instanceof Throwable) { + throw new AssertionError("ChangeShardMembersVotingStatus failed", (Throwable)response); + } + + assertNull("Expected null Success response. Actual " + response, response); + + verifyOwner(leaderDistributedDataStore, ENTITY1, "member-4"); + verifyOwner(leaderDistributedDataStore, ENTITY2, "member-5"); + } + private static void verifyGetOwnershipState(final DOMEntityOwnershipService service, final DOMEntity entity, final EntityOwnershipState expState) { Optional state = service.getOwnershipState(entity);