X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipService.java;h=f782fc24147d0830965de2fe335e3ca603e5a29f;hp=cd45ef58a9660c331aae11c1f691b62580039b2f;hb=077b0b3a083c96c72f32116491158a930ff770d2;hpb=4f2d31367df3b74d326d4a7c69bd20789d020198 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java index cd45ef58a9..f782fc2414 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipService.java @@ -7,11 +7,16 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNER_NODE_ID; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityPath; import akka.actor.ActorRef; import akka.dispatch.OnComplete; +import akka.pattern.Patterns; import akka.util.Timeout; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.base.Strings; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -23,19 +28,28 @@ import org.opendaylight.controller.cluster.datastore.entityownership.messages.Re import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterListenerLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterCandidateLocal; import org.opendaylight.controller.cluster.datastore.entityownership.messages.UnregisterListenerLocal; +import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig; import org.opendaylight.controller.cluster.datastore.messages.CreateShard; +import org.opendaylight.controller.cluster.datastore.messages.GetShardDataTree; import org.opendaylight.controller.cluster.datastore.shardstrategy.ModuleShardStrategy; 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.md.sal.common.api.clustering.EntityOwnershipListener; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListenerRegistration; import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService; +import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipState; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.clustering.entity.owners.rev150804.EntityOwners; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; +import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import scala.concurrent.Await; import scala.concurrent.Future; +import scala.concurrent.duration.Duration; /** * The distributed implementation of the EntityOwnershipService. @@ -48,8 +62,9 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService private static final Timeout MESSAGE_TIMEOUT = new Timeout(1, TimeUnit.MINUTES); private final DistributedDataStore datastore; - private final ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); + private final ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); private volatile ActorRef localEntityOwnershipShard; + private volatile DataTree localEntityOwnershipShardDataTree; public DistributedEntityOwnershipService(DistributedDataStore datastore) { this.datastore = datastore; @@ -62,7 +77,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService Collection entityOwnersMemberNames = configuration.getUniqueMemberNamesForAllShards(); CreateShard createShard = new CreateShard(new ModuleShardConfiguration(EntityOwners.QNAME.getNamespace(), "entity-owners", ENTITY_OWNERSHIP_SHARD_NAME, ModuleShardStrategy.NAME, entityOwnersMemberNames), - newShardPropsCreator(), null); + newShardBuilder(), null); Future createFuture = datastore.getActorContext().executeOperationAsync(shardManagerActor, createShard, MESSAGE_TIMEOUT); @@ -114,28 +129,26 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public EntityOwnershipCandidateRegistration registerCandidate(Entity entity, EntityOwnershipCandidate candidate) + public EntityOwnershipCandidateRegistration registerCandidate(Entity entity) throws CandidateAlreadyRegisteredException { Preconditions.checkNotNull(entity, "entity cannot be null"); - Preconditions.checkNotNull(candidate, "candidate cannot be null"); - EntityOwnershipCandidate currentCandidate = registeredEntities.putIfAbsent(entity, candidate); - if(currentCandidate != null) { - throw new CandidateAlreadyRegisteredException(entity, currentCandidate); + if(registeredEntities.putIfAbsent(entity, entity) != null) { + throw new CandidateAlreadyRegisteredException(entity); } - RegisterCandidateLocal registerCandidate = new RegisterCandidateLocal(candidate, entity); + RegisterCandidateLocal registerCandidate = new RegisterCandidateLocal(entity); LOG.debug("Registering candidate with message: {}", registerCandidate); executeLocalEntityOwnershipShardOperation(registerCandidate); - return new DistributedEntityOwnershipCandidateRegistration(candidate, entity, this); + return new DistributedEntityOwnershipCandidateRegistration(entity, this); } - void unregisterCandidate(Entity entity, EntityOwnershipCandidate entityOwnershipCandidate) { - LOG.debug("Unregistering candidate {} for {}", entityOwnershipCandidate, entity); + void unregisterCandidate(Entity entity) { + LOG.debug("Unregistering candidate for {}", entity); - executeLocalEntityOwnershipShardOperation(new UnregisterCandidateLocal(entityOwnershipCandidate, entity)); + executeLocalEntityOwnershipShardOperation(new UnregisterCandidateLocal(entity)); registeredEntities.remove(entity); } @@ -152,6 +165,49 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService return new DistributedEntityOwnershipListenerRegistration(listener, entityType, this); } + @Override + public Optional getOwnershipState(Entity forEntity) { + Preconditions.checkNotNull(forEntity, "forEntity cannot be null"); + + DataTree dataTree = getLocalEntityOwnershipShardDataTree(); + if(dataTree == null) { + return Optional.absent(); + } + + Optional> entityNode = dataTree.takeSnapshot().readNode( + entityPath(forEntity.getType(), forEntity.getId())); + if(!entityNode.isPresent()) { + return Optional.absent(); + } + + String localMemberName = datastore.getActorContext().getCurrentMemberName(); + Optional> ownerLeaf = ((MapEntryNode)entityNode.get()). + getChild(ENTITY_OWNER_NODE_ID); + String owner = ownerLeaf.isPresent() ? ownerLeaf.get().getValue().toString() : null; + boolean hasOwner = !Strings.isNullOrEmpty(owner); + boolean isOwner = hasOwner && localMemberName.equals(owner); + + return Optional.of(new EntityOwnershipState(isOwner, hasOwner)); + } + + private DataTree getLocalEntityOwnershipShardDataTree() { + if(localEntityOwnershipShardDataTree == null) { + try { + if(localEntityOwnershipShard == null) { + localEntityOwnershipShard = Await.result(datastore.getActorContext().findLocalShardAsync( + ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf()); + } + + localEntityOwnershipShardDataTree = (DataTree) Await.result(Patterns.ask(localEntityOwnershipShard, + GetShardDataTree.INSTANCE, MESSAGE_TIMEOUT), Duration.Inf()); + } catch (Exception e) { + LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e); + } + } + + return localEntityOwnershipShardDataTree; + } + void unregisterListener(String entityType, EntityOwnershipListener listener) { LOG.debug("Unregistering listener {} for entity type {}", listener, entityType); @@ -162,8 +218,9 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService public void close() { } - protected EntityOwnershipShardPropsCreator newShardPropsCreator() { - return new EntityOwnershipShardPropsCreator(datastore.getActorContext().getCurrentMemberName()); + protected EntityOwnershipShard.Builder newShardBuilder() { + return EntityOwnershipShard.newBuilder().localMemberName(datastore.getActorContext().getCurrentMemberName()) + .ownerSelectionStrategyConfig(EntityOwnerSelectionStrategyConfig.newBuilder().build()); } @VisibleForTesting