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=aaf4bc2de99e22ea041d9964a84bcff973ce06d9;hp=e5c17f54c6234b777c8175396eb10f8f82f9f249;hb=af7843cb8ff928e5cce9fbd94afd441cdf857dde;hpb=15741ff84dcd9bab5ab382a3ceaa48ceddffb9a3 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 e5c17f54c6..aaf4bc2de9 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; @@ -37,6 +38,7 @@ 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; @@ -56,7 +58,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; @@ -130,7 +131,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(); @@ -184,6 +185,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)); @@ -194,13 +196,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"); @@ -271,7 +274,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(); @@ -290,6 +293,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()); @@ -320,6 +325,18 @@ 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 + + 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())); + + MemberNode.verifyRaftState(follower2Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, + raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + // Shutdown the leader and verify its removed from the candidate list leaderNode.cleanup(); @@ -348,7 +365,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) @@ -379,6 +396,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 = @@ -419,6 +441,20 @@ 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())); + + MemberNode.verifyRaftState(follower1Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, + raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + + MemberNode.verifyRaftState(follower2Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, + raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + + MemberNode.verifyRaftState(follower4Node.configDataStore(), ENTITY_OWNERSHIP_SHARD_NAME, + raftState -> assertEquals("Last index", leaderLastIndex.get(), raftState.getLastIndex())); + // Shutdown the leader and follower3 leaderNode.cleanup(); @@ -449,7 +485,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) @@ -621,7 +657,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(); @@ -664,7 +700,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();