X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipIntegrationTest.java;h=0b4935734f474089eea1b553b1e27b082dba3349;hp=e1a5759a41c68889c0e09cb7357850c97937058b;hb=4f99287c091545e966efa25094af56220f8779b0;hpb=e04c7f93b0b614580c45318585f7709192465757
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 e1a5759a41..0b4935734f 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
@@ -22,6 +22,7 @@ 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;
@@ -45,11 +46,14 @@ 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.RaftState;
import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState;
+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;
@@ -119,7 +123,7 @@ public class DistributedEntityOwnershipIntegrationTest {
}
}
- private DistributedEntityOwnershipService newOwnershipService(DistributedDataStore datastore) {
+ private static DistributedEntityOwnershipService newOwnershipService(DistributedDataStore datastore) {
DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(datastore,
EntityOwnerSelectionStrategyConfig.newBuilder().build());
service.start();
@@ -259,6 +263,85 @@ 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();
+
+ EntityOwnershipService leaderEntityOwnershipService = newOwnershipService(leaderDistributedDataStore);
+ EntityOwnershipService follower1EntityOwnershipService = newOwnershipService(follower1Node.configDataStore());
+ EntityOwnershipService 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 folower1 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, new RaftStateVerifier() {
+ @Override
+ public void verify(OnDemandRaftState 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");
+ }
+
/**
* Reproduces bug 4554
*
@@ -303,10 +386,6 @@ public class DistributedEntityOwnershipIntegrationTest {
Mockito.reset(leaderMockListener);
- candidate1.close();
- candidate2.close();
- candidate3.close();
-
ArgumentCaptor leaderChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class);
ArgumentCaptor follower1ChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class);
ArgumentCaptor follower2ChangeCaptor = ArgumentCaptor.forClass(EntityOwnershipChange.class);
@@ -314,11 +393,18 @@ public class DistributedEntityOwnershipIntegrationTest {
doNothing().when(follower1MockListener).ownershipChanged(follower1ChangeCaptor.capture());
doNothing().when(follower2MockListener).ownershipChanged(follower2ChangeCaptor.capture());
+ candidate1.close();
+ candidate2.close();
+ candidate3.close();
+
boolean passed = false;
for(int i=0;i<100;i++) {
Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
- if(!leaderEntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() &&
+ if(!leaderEntityOwnershipService.getOwnershipState(ENTITY1).isPresent() ||
+ !leaderEntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() &&
+ follower1EntityOwnershipService.getOwnershipState(ENTITY1).isPresent() &&
!follower1EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() &&
+ follower2EntityOwnershipService.getOwnershipState(ENTITY1).isPresent() &&
!follower2EntityOwnershipService.getOwnershipState(ENTITY1).get().hasOwner() &&
leaderChangeCaptor.getAllValues().size() > 0 && !leaderChangeCaptor.getValue().hasOwner() &&
leaderChangeCaptor.getAllValues().size() > 0 && !follower1ChangeCaptor.getValue().hasOwner() &&
@@ -417,7 +503,7 @@ public class DistributedEntityOwnershipIntegrationTest {
private static void verifyCandidates(DistributedDataStore dataStore, Entity entity, 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);
try {