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=d15ea39beb705ce9ed46b3ca63be670e911cdd9d;hpb=7a602c554a1421ceb0da9f1ae297c17f705f663f;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 d15ea39beb..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;
@@ -52,12 +55,11 @@ 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;
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;
@@ -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.
@@ -131,7 +136,7 @@ public class DistributedEntityOwnershipIntegrationTest {
@Test
public void testFunctionalityWithThreeNodes() throws Exception {
- String name = "test";
+ String name = "testFunctionalityWithThreeNodes";
MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name)
.moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false)
.datastoreContextBuilder(leaderDatastoreContextBuilder).build();
@@ -274,7 +279,7 @@ public class DistributedEntityOwnershipIntegrationTest {
followerDatastoreContextBuilder.shardElectionTimeoutFactor(5)
.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName());
- String name = "test";
+ String name = "testLeaderEntityOwnersReassignedAfterShutdown";
MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name)
.moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false)
.datastoreContextBuilder(leaderDatastoreContextBuilder).build();
@@ -293,6 +298,8 @@ public class DistributedEntityOwnershipIntegrationTest {
follower1Node.configDataStore().waitTillReady();
follower2Node.configDataStore().waitTillReady();
+ follower1Node.waitForMembersUp("member-1", "member-3");
+
final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore);
final DOMEntityOwnershipService follower1EntityOwnershipService =
newOwnershipService(follower1Node.configDataStore());
@@ -323,20 +330,23 @@ public class DistributedEntityOwnershipIntegrationTest {
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
+ // Re-enable elections on all remaining followers so one becomes the new 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()));
+ 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");
+ follower2Node.waitForMemberDown("member-1");
// Verify the prior leader's entity owners are re-assigned.
@@ -351,7 +361,7 @@ public class DistributedEntityOwnershipIntegrationTest {
followerDatastoreContextBuilder.shardElectionTimeoutFactor(5)
.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName());
- String name = "test";
+ String name = "testLeaderAndFollowerEntityOwnersReassignedAfterShutdown";
final MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1")
.useAkkaArtery(false).testName(name)
.moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT)
@@ -382,6 +392,11 @@ public class DistributedEntityOwnershipIntegrationTest {
leaderDistributedDataStore.waitTillReady();
follower1Node.configDataStore().waitTillReady();
follower2Node.configDataStore().waitTillReady();
+ follower3Node.configDataStore().waitTillReady();
+ follower4Node.configDataStore().waitTillReady();
+
+ leaderNode.waitForMembersUp("member-2", "member-3", "member-4", "member-5");
+ follower1Node.waitForMembersUp("member-1", "member-3", "member-4", "member-5");
final DOMEntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore);
final DOMEntityOwnershipService follower1EntityOwnershipService =
@@ -422,6 +437,23 @@ public class DistributedEntityOwnershipIntegrationTest {
verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-1", "member-3", "member-4");
verifyOwner(leaderDistributedDataStore, ENTITY2, "member-1");
+ // Re-enable elections on all remaining followers so one becomes the new leader
+
+ ActorRef follower1Shard = IntegrationTestKit.findLocalShard(follower1Node.configDataStore().getActorContext(),
+ ENTITY_OWNERSHIP_SHARD_NAME);
+ follower1Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
+ .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
+
+ ActorRef follower2Shard = IntegrationTestKit.findLocalShard(follower2Node.configDataStore().getActorContext(),
+ ENTITY_OWNERSHIP_SHARD_NAME);
+ follower2Shard.tell(DatastoreContext.newBuilderFrom(followerDatastoreContextBuilder.build())
+ .customRaftPolicyImplementation(null).build(), ActorRef.noSender());
+
+ 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
leaderNode.cleanup();
@@ -429,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.
@@ -452,7 +478,7 @@ public class DistributedEntityOwnershipIntegrationTest {
* 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)
@@ -624,7 +650,7 @@ public class DistributedEntityOwnershipIntegrationTest {
@Test
public void testOwnerSelectedOnRapidUnregisteringAndRegisteringOfCandidates() throws Exception {
- String name = "test";
+ String name = "testOwnerSelectedOnRapidUnregisteringAndRegisteringOfCandidates";
MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name)
.moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false)
.datastoreContextBuilder(leaderDatastoreContextBuilder).build();
@@ -667,7 +693,7 @@ public class DistributedEntityOwnershipIntegrationTest {
@Test
public void testOwnerSelectedOnRapidRegisteringAndUnregisteringOfCandidates() throws Exception {
- String name = "test";
+ String name = "testOwnerSelectedOnRapidRegisteringAndUnregisteringOfCandidates";
MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name)
.moduleShardsConfig(MODULE_SHARDS_CONFIG).schemaContext(SCHEMA_CONTEXT).createOperDatastore(false)
.datastoreContextBuilder(leaderDatastoreContextBuilder).build();
@@ -708,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