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=ad80b86e02ac5186baa8c472c75063c204223a4c;hb=c4b4b98f56ab1d9821edb737912632c2867ae783;hp=6273e13dff49fd5e3c42987f08848b6cb07f632e;hpb=f899094ab7c5ac2a8bfe141b27ba11c5b9e34b02;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 6273e13dff..ad80b86e02 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,10 @@ 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.Optional; +import akka.pattern.Patterns; +import akka.util.Timeout; 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; @@ -37,6 +38,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Optional; import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Before; @@ -52,6 +54,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.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; @@ -67,6 +70,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. @@ -123,7 +129,7 @@ public class DistributedEntityOwnershipIntegrationTest { } private static DistributedEntityOwnershipService newOwnershipService(final AbstractDataStore datastore) { - return DistributedEntityOwnershipService.start(datastore.getActorContext(), + return DistributedEntityOwnershipService.start(datastore.getActorUtils(), EntityOwnerSelectionStrategyConfig.newBuilder().build()); } @@ -154,7 +160,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); leaderEntityOwnershipService.registerListener(ENTITY_TYPE2, leaderMockListener2); @@ -299,7 +305,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register follower1 candidate for entity1 and verify it becomes owner @@ -325,12 +331,12 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on all remaining followers so one becomes the new leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); @@ -400,7 +406,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower3Node.configDataStore()); newOwnershipService(follower4Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register follower1 candidate for entity1 and verify it becomes owner @@ -432,17 +438,17 @@ public class DistributedEntityOwnershipIntegrationTest { // Re-enable elections on all remaining followers so one becomes the new leader - ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(), + ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(), + ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); - ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorContext(), + ActorRef follower4Shard = IntegrationTestKit.findLocalShard(follower4Node.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); follower4Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build()) .customRaftPolicyImplementation(null).build(), ActorRef.noSender()); @@ -497,7 +503,7 @@ public class DistributedEntityOwnershipIntegrationTest { final DOMEntityOwnershipService follower2EntityOwnershipService = newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); leaderEntityOwnershipService.registerListener(ENTITY_TYPE1, leaderMockListener); follower1EntityOwnershipService.registerListener(ENTITY_TYPE1, follower1MockListener); @@ -558,10 +564,10 @@ public class DistributedEntityOwnershipIntegrationTest { private static Optional getValueSafely(ArgumentCaptor captor) { try { - return Optional.fromNullable(captor.getValue()); + return Optional.ofNullable(captor.getValue()); } catch (MockitoException e) { // No value was captured - return Optional.absent(); + return Optional.empty(); } } @@ -581,7 +587,7 @@ public class DistributedEntityOwnershipIntegrationTest { AbstractDataStore leaderDistributedDataStore = leaderNode.configDataStore(); final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); MemberNode follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name) .moduleShardsConfig(moduleShardsConfig).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false) @@ -605,9 +611,9 @@ public class DistributedEntityOwnershipIntegrationTest { // Add replica in follower1 AddShardReplica addReplica = new AddShardReplica(ENTITY_OWNERSHIP_SHARD_NAME); - follower1DistributedDataStore.getActorContext().getShardManager().tell(addReplica, + follower1DistributedDataStore.getActorUtils().getShardManager().tell(addReplica, follower1Node.kit().getRef()); - Object reply = follower1Node.kit().expectMsgAnyClassOf(JavaTestKit.duration("5 sec"), + Object reply = follower1Node.kit().expectMsgAnyClassOf(follower1Node.kit().duration("5 sec"), Success.class, Failure.class); if (reply instanceof Failure) { throw new AssertionError("AddShardReplica failed", ((Failure)reply).cause()); @@ -667,7 +673,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower1Node.configDataStore()); newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner @@ -710,7 +716,7 @@ public class DistributedEntityOwnershipIntegrationTest { newOwnershipService(follower1Node.configDataStore()); newOwnershipService(follower2Node.configDataStore()); - leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorContext(), ENTITY_OWNERSHIP_SHARD_NAME); + leaderNode.kit().waitUntilLeader(leaderNode.configDataStore().getActorUtils(), ENTITY_OWNERSHIP_SHARD_NAME); // Register leader candidate for entity1 and verify it becomes owner @@ -727,10 +733,113 @@ 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().getActorUtils(), + ENTITY_OWNERSHIP_SHARD_NAME); + + // Make member4 and member5 non-voting + + Future future = Patterns.ask(leaderDistributedDataStore.getActorUtils().getShardManager(), + new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, + ImmutableMap.of("member-4", Boolean.FALSE, "member-5", Boolean.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.getActorUtils().getShardManager(), + new ChangeShardMembersVotingStatus(ENTITY_OWNERSHIP_SHARD_NAME, + ImmutableMap.of("member-3", Boolean.FALSE, "member-4", Boolean.TRUE, "member-5", Boolean.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); - assertEquals("getOwnershipState present", true, state.isPresent()); + assertTrue("getOwnershipState present", state.isPresent()); assertEquals("EntityOwnershipState", expState, state.get()); } @@ -743,7 +852,7 @@ public class DistributedEntityOwnershipIntegrationTest { .read(entityPath(entity.getType(), entity.getIdentifier()).node(Candidate.QNAME)) .get(5, TimeUnit.SECONDS); try { - assertEquals("Candidates not found for " + entity, true, possible.isPresent()); + assertTrue("Candidates not found for " + entity, possible.isPresent()); Collection actual = new ArrayList<>(); for (MapEntryNode candidate: ((MapNode)possible.get()).getValue()) { actual.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString());