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=4855baec6ac7a802f7d6309950bba996237aae96;hp=6ff4ad25ec821700de1d45e82b6c3839b193084f;hb=56af1b2a45b4a567813de5314c31aaf26a2e4052;hpb=5a0edd493bafc365647bc6311b4b7da86a78645d;ds=sidebyside
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 6ff4ad25ec..4855baec6a 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
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals;
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.doNothing;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@@ -44,6 +45,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
+import org.mockito.exceptions.base.MockitoException;
import org.opendaylight.controller.cluster.datastore.AbstractDataStore;
import org.opendaylight.controller.cluster.datastore.DatastoreContext;
import org.opendaylight.controller.cluster.datastore.IntegrationTestKit;
@@ -55,7 +57,6 @@ import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolic
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;
@@ -129,7 +130,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();
@@ -183,6 +184,7 @@ public class DistributedEntityOwnershipIntegrationTest {
follower1EntityOwnershipService.registerCandidate(ENTITY1);
verifyCandidates(leaderDistributedDataStore, ENTITY1, "member-1", "member-2");
verifyOwner(leaderDistributedDataStore, ENTITY1, "member-1");
+ verifyOwner(follower2Node.configDataStore(), ENTITY1, "member-1");
Uninterruptibles.sleepUninterruptibly(300, TimeUnit.MILLISECONDS);
verify(leaderMockListener, never()).ownershipChanged(ownershipChange(ENTITY1));
verify(follower1MockListener, never()).ownershipChanged(ownershipChange(ENTITY1));
@@ -193,13 +195,14 @@ public class DistributedEntityOwnershipIntegrationTest {
follower1EntityOwnershipService.registerCandidate(ENTITY2);
verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, true, true));
verify(leaderMockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY2, false, false, true));
+ verifyOwner(follower2Node.configDataStore(), ENTITY2, "member-2");
reset(leaderMockListener, follower1MockListener);
// 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));
+ verify(follower2MockListener, timeout(5000).times(2)).ownershipChanged(or(
+ ownershipChange(ENTITY1, false, false, true), ownershipChange(ENTITY2, false, false, true)));
follower2EntityOwnershipService.registerCandidate(ENTITY2);
verifyCandidates(leaderDistributedDataStore, ENTITY2, "member-2", "member-3");
@@ -270,7 +273,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();
@@ -347,24 +350,29 @@ public class DistributedEntityOwnershipIntegrationTest {
followerDatastoreContextBuilder.shardElectionTimeoutFactor(5)
.customRaftPolicyImplementation(DisableElectionsRaftPolicy.class.getName());
- String name = "test";
- final MemberNode leaderNode = MemberNode.builder(memberNodes).akkaConfig("Member1").testName(name)
+ String name = "testLeaderAndFollowerEntityOwnersReassignedAfterShutdown";
+ final MemberNode leaderNode = 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 follower1Node = MemberNode.builder(memberNodes).akkaConfig("Member2").testName(name)
+ final MemberNode follower1Node = 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 follower2Node = MemberNode.builder(memberNodes).akkaConfig("Member3").testName(name)
+ final MemberNode follower2Node = 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 follower3Node = MemberNode.builder(memberNodes).akkaConfig("Member4").testName(name)
+ final MemberNode follower3Node = 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 follower4Node = MemberNode.builder(memberNodes).akkaConfig("Member5").testName(name)
+ final MemberNode follower4Node = MemberNode.builder(memberNodes).akkaConfig("Member5")
+ .useAkkaArtery(false).testName(name)
.moduleShardsConfig(MODULE_SHARDS_5_NODE_CONFIG).schemaContext(SCHEMA_CONTEXT)
.createOperDatastore(false).datastoreContextBuilder(followerDatastoreContextBuilder).build();
@@ -443,7 +451,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)
@@ -481,10 +489,13 @@ public class DistributedEntityOwnershipIntegrationTest {
final DOMEntityOwnershipCandidateRegistration candidate2 =
follower1EntityOwnershipService.registerCandidate(ENTITY1);
+ verify(follower1MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true));
+
final DOMEntityOwnershipCandidateRegistration candidate3 =
follower2EntityOwnershipService.registerCandidate(ENTITY1);
+ verify(follower2MockListener, timeout(5000)).ownershipChanged(ownershipChange(ENTITY1, false, false, true));
- Mockito.reset(leaderMockListener);
+ Mockito.reset(leaderMockListener, follower1MockListener, follower2MockListener);
ArgumentCaptor leaderChangeCaptor =
ArgumentCaptor.forClass(DOMEntityOwnershipChange.class);
@@ -503,20 +514,20 @@ public class DistributedEntityOwnershipIntegrationTest {
boolean passed = false;
for (int i = 0; i < 100; i++) {
Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
- 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()) {
+ final Optional leaderState = leaderEntityOwnershipService.getOwnershipState(ENTITY1);
+ final Optional follower1State =
+ follower1EntityOwnershipService.getOwnershipState(ENTITY1);
+ final Optional follower2State =
+ follower2EntityOwnershipService.getOwnershipState(ENTITY1);
+ final Optional leaderChange = getValueSafely(leaderChangeCaptor);
+ final Optional follower1Change = getValueSafely(follower1ChangeCaptor);
+ final Optional follower2Change = getValueSafely(follower2ChangeCaptor);
+ if (!leaderState.isPresent() || leaderState.get() == EntityOwnershipState.NO_OWNER
+ && follower1State.isPresent() && follower1State.get() == EntityOwnershipState.NO_OWNER
+ && follower2State.isPresent() && follower2State.get() == EntityOwnershipState.NO_OWNER
+ && leaderChange.isPresent() && !leaderChange.get().getState().hasOwner()
+ && follower1Change.isPresent() && !follower1Change.get().getState().hasOwner()
+ && follower2Change.isPresent() && !follower2Change.get().getState().hasOwner()) {
passed = true;
break;
}
@@ -525,6 +536,15 @@ public class DistributedEntityOwnershipIntegrationTest {
assertTrue("No ownership change message was sent with hasOwner=false", passed);
}
+ private static Optional getValueSafely(ArgumentCaptor captor) {
+ try {
+ return Optional.fromNullable(captor.getValue());
+ } catch (MockitoException e) {
+ // No value was captured
+ return Optional.absent();
+ }
+ }
+
/**
* Tests bootstrapping the entity-ownership shard when there's no shards initially configured for local
* member. The entity-ownership shard is initially created as inactive (ie remains a follower), requiring
@@ -603,7 +623,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();
@@ -646,7 +666,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();