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%2FDistributedEntityOwnershipServiceTest.java;h=c2d997f7029b922a6f5247ec045ceee45b605b38;hp=ee5b1c5a2d3d1f5a896e05e56c20b18ad2a010ba;hb=a507f19b518f36065c74f4f88c9327ede28ff640;hpb=9883165b61255af5bfcb060b76b16f69a56b1f82 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java index ee5b1c5a2d..c2d997f702 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java @@ -10,10 +10,15 @@ package org.opendaylight.controller.cluster.datastore.entityownership; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import akka.actor.ActorRef; +import akka.actor.PoisonPill; import akka.actor.Props; +import com.google.common.base.Optional; +import com.google.common.base.Stopwatch; +import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Uninterruptibles; import java.util.Collections; import java.util.List; @@ -21,22 +26,27 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.AbstractActorTest; import org.opendaylight.controller.cluster.datastore.DatastoreContext; import org.opendaylight.controller.cluster.datastore.DistributedDataStore; import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterCandidateLocal; +import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; +import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategy; +import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; import org.opendaylight.controller.cluster.datastore.utils.MockClusterWrapper; import org.opendaylight.controller.cluster.datastore.utils.MockConfiguration; -import org.opendaylight.controller.md.cluster.datastore.model.TestModel; +import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException; import org.opendaylight.controller.md.sal.common.api.clustering.Entity; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidate; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipCandidateRegistration; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +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; @@ -47,7 +57,7 @@ import scala.concurrent.duration.Duration; * * @author Thomas Pantelis */ -public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { +public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnershipTest { static String ENTITY_TYPE = "test"; static String ENTITY_TYPE2 = "test2"; static int ID_COUNTER = 1; @@ -57,13 +67,39 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { private DistributedDataStore dataStore; @Before - public void setUp() throws Exception { + public void setUp() { DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreType(dataStoreType). shardInitializationTimeout(10, TimeUnit.SECONDS).build(); - dataStore = new DistributedDataStore(getSystem(), new MockClusterWrapper(), - new MockConfiguration(Collections.>emptyMap()), datastoreContext ); - dataStore.onGlobalContextUpdated(TestModel.createTestContext()); + // FIXME - remove this MockConfiguration and use the production ConfigurationImpl class when the + // DistributedEntityOwnershipService is changed to setup the ShardStrategy for the entity-owners module. + MockConfiguration configuration = new MockConfiguration(Collections.>emptyMap()) { + @Override + public Optional getModuleNameFromNameSpace(String nameSpace) { + return Optional.of("entity-owners"); + } + + @Override + public Map getModuleNameToShardStrategyMap() { + return ImmutableMap.builder().put("entity-owners", new ShardStrategy() { + @Override + public String findShard(YangInstanceIdentifier path) { + return DistributedEntityOwnershipService.ENTITY_OWNERSHIP_SHARD_NAME; + } + }).build(); + } + }; + + dataStore = new DistributedDataStore(getSystem(), new MockClusterWrapper(), configuration, datastoreContext ); + + dataStore.onGlobalContextUpdated(SchemaContextHelper.entityOwners()); + + ShardStrategyFactory.setConfiguration(configuration); + } + + @After + public void tearDown() { + dataStore.getActorContext().getShardManager().tell(PoisonPill.getInstance(), ActorRef.noSender()); } @Test @@ -93,15 +129,18 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); - Entity entity = new Entity(ENTITY_TYPE, YangInstanceIdentifier.of(QNAME)); + YangInstanceIdentifier entityId = YangInstanceIdentifier.of(QNAME); + Entity entity = new Entity(ENTITY_TYPE, entityId); EntityOwnershipCandidate candidate = mock(EntityOwnershipCandidate.class); EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity, candidate); verifyEntityOwnershipCandidateRegistration(entity, reg); verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); + verifyEntityCandidate(readEntityOwners(service.getLocalEntityOwnershipShard()), ENTITY_TYPE, entityId, + dataStore.getActorContext().getCurrentMemberName()); - // Test same entity - should throw exception + // Register the same entity - should throw exception EntityOwnershipCandidate candidate2 = mock(EntityOwnershipCandidate.class); try { @@ -113,15 +152,57 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { assertEquals("getEntity", entity, e.getEntity()); } - // Test different entity + // Register a different entity - should succeed - Entity entity2 = new Entity(ENTITY_TYPE2, YangInstanceIdentifier.of(QNAME)); + Entity entity2 = new Entity(ENTITY_TYPE2, entityId); shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); EntityOwnershipCandidateRegistration reg2 = service.registerCandidate(entity2, candidate); verifyEntityOwnershipCandidateRegistration(entity2, reg2); verifyRegisterCandidateLocal(shardPropsCreator, entity2, candidate); + verifyEntityCandidate(readEntityOwners(service.getLocalEntityOwnershipShard()), ENTITY_TYPE2, entityId, + dataStore.getActorContext().getCurrentMemberName()); + + service.close(); + } + + @Test + public void testCloseCandidateRegistration() throws Exception { + final TestShardPropsCreator shardPropsCreator = new TestShardPropsCreator(); + DistributedEntityOwnershipService service = new DistributedEntityOwnershipService(dataStore) { + @Override + protected EntityOwnershipShardPropsCreator newShardPropsCreator() { + return shardPropsCreator; + } + }; + + service.start(); + + shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); + + Entity entity = new Entity(ENTITY_TYPE, YangInstanceIdentifier.of(QNAME)); + EntityOwnershipCandidate candidate = mock(EntityOwnershipCandidate.class); + + EntityOwnershipCandidateRegistration reg = service.registerCandidate(entity, candidate); + + verifyEntityOwnershipCandidateRegistration(entity, reg); + verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); + + shardPropsCreator.expectShardMessage(UnregisterCandidateLocal.class); + + reg.close(); + + UnregisterCandidateLocal unregCandidate = shardPropsCreator.waitForShardMessage(); + assertEquals("getEntity", entity, unregCandidate.getEntity()); + + // Re-register - should succeed. + + shardPropsCreator.expectShardMessage(RegisterCandidateLocal.class); + + service.registerCandidate(entity, candidate); + + verifyRegisterCandidateLocal(shardPropsCreator, entity, candidate); service.close(); } @@ -130,6 +211,22 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { public void testRegisterListener() { } + private NormalizedNode readEntityOwners(ActorRef shard) throws Exception { + Stopwatch sw = Stopwatch.createStarted(); + while(sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) { + DOMStoreReadTransaction readTx = dataStore.newReadOnlyTransaction(); + Optional> optional = readTx.read(EntityOwnershipShard.ENTITY_OWNERS_PATH). + checkedGet(5, TimeUnit.SECONDS); + if(optional.isPresent()) { + return optional.get(); + } + + Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); + } + + return null; + } + private void verifyRegisterCandidateLocal(final TestShardPropsCreator shardPropsCreator, Entity entity, EntityOwnershipCandidate candidate) { RegisterCandidateLocal regCandidate = shardPropsCreator.waitForShardMessage(); @@ -143,6 +240,10 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { } static class TestShardPropsCreator extends EntityOwnershipShardPropsCreator { + TestShardPropsCreator() { + super("member-1"); + } + private final AtomicReference messageReceived = new AtomicReference<>(); private final AtomicReference receivedMessage = new AtomicReference<>(); private final AtomicReference> messageClass = new AtomicReference<>(); @@ -151,13 +252,13 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { public Props newProps(ShardIdentifier shardId, Map peerAddresses, DatastoreContext datastoreContext, SchemaContext schemaContext) { return Props.create(TestEntityOwnershipShard.class, shardId, peerAddresses, datastoreContext, - schemaContext, messageClass, messageReceived, receivedMessage); + schemaContext, "member-1", messageClass, messageReceived, receivedMessage); } @SuppressWarnings("unchecked") T waitForShardMessage() { - assertEquals("Message received", true, Uninterruptibles.awaitUninterruptibly( - messageReceived.get(), 5, TimeUnit.SECONDS)); + assertTrue("Message " + messageClass.get().getSimpleName() + " was not received", + Uninterruptibles.awaitUninterruptibly(messageReceived.get(), 5, TimeUnit.SECONDS)); assertEquals("Message type", messageClass.get(), receivedMessage.get().getClass()); return (T) receivedMessage.get(); } @@ -175,9 +276,10 @@ public class DistributedEntityOwnershipServiceTest extends AbstractActorTest { private final AtomicReference> messageClass; protected TestEntityOwnershipShard(ShardIdentifier name, Map peerAddresses, - DatastoreContext datastoreContext, SchemaContext schemaContext, AtomicReference> messageClass, - AtomicReference messageReceived, AtomicReference receivedMessage) { - super(name, peerAddresses, datastoreContext, schemaContext); + DatastoreContext datastoreContext, SchemaContext schemaContext, String localMemberName, + AtomicReference> messageClass, AtomicReference messageReceived, + AtomicReference receivedMessage) { + super(name, peerAddresses, datastoreContext, schemaContext, localMemberName); this.messageClass = messageClass; this.messageReceived = messageReceived; this.receivedMessage = receivedMessage;