X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipService.java;h=8055be832de5d85ea89219dc1bde8ed6a98524af;hb=24c074a4b32ac97980a652b78824b7c2f97ffb78;hp=f782fc24147d0830965de2fe335e3ca603e5a29f;hpb=077b0b3a083c96c72f32116491158a930ff770d2;p=controller.git 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 f782fc2414..8055be832d 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,6 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.CANDIDATE_NODE_ID; 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; @@ -21,7 +22,8 @@ import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import org.opendaylight.controller.cluster.datastore.DistributedDataStore; +import javax.annotation.Nonnull; +import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration; import org.opendaylight.controller.cluster.datastore.entityownership.messages.RegisterCandidateLocal; @@ -32,6 +34,7 @@ import org.opendaylight.controller.cluster.datastore.entityownership.selectionst 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.cluster.datastore.utils.ActorContext; 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.EntityOwnershipCandidateRegistration; @@ -43,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll 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.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.slf4j.Logger; @@ -57,63 +61,70 @@ import scala.concurrent.duration.Duration; * @author Thomas Pantelis */ public class DistributedEntityOwnershipService implements EntityOwnershipService, AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(DistributedEntityOwnershipService.class); + @VisibleForTesting static final String ENTITY_OWNERSHIP_SHARD_NAME = "entity-ownership"; + + private static final Logger LOG = LoggerFactory.getLogger(DistributedEntityOwnershipService.class); private static final Timeout MESSAGE_TIMEOUT = new Timeout(1, TimeUnit.MINUTES); - private final DistributedDataStore datastore; private final ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); + private final ActorContext context; + private volatile ActorRef localEntityOwnershipShard; private volatile DataTree localEntityOwnershipShardDataTree; - public DistributedEntityOwnershipService(DistributedDataStore datastore) { - this.datastore = datastore; + private DistributedEntityOwnershipService(final ActorContext context) { + this.context = Preconditions.checkNotNull(context); } - public void start() { - ActorRef shardManagerActor = datastore.getActorContext().getShardManager(); + public static DistributedEntityOwnershipService start(final ActorContext context, + final EntityOwnerSelectionStrategyConfig strategyConfig) { + ActorRef shardManagerActor = context.getShardManager(); - Configuration configuration = datastore.getActorContext().getConfiguration(); - Collection entityOwnersMemberNames = configuration.getUniqueMemberNamesForAllShards(); + Configuration configuration = context.getConfiguration(); + Collection entityOwnersMemberNames = configuration.getUniqueMemberNamesForAllShards(); CreateShard createShard = new CreateShard(new ModuleShardConfiguration(EntityOwners.QNAME.getNamespace(), "entity-owners", ENTITY_OWNERSHIP_SHARD_NAME, ModuleShardStrategy.NAME, entityOwnersMemberNames), - newShardBuilder(), null); + newShardBuilder(context, strategyConfig), null); - Future createFuture = datastore.getActorContext().executeOperationAsync(shardManagerActor, + Future createFuture = context.executeOperationAsync(shardManagerActor, createShard, MESSAGE_TIMEOUT); createFuture.onComplete(new OnComplete() { @Override - public void onComplete(Throwable failure, Object response) { - if(failure != null) { - LOG.error("Failed to create {} shard", ENTITY_OWNERSHIP_SHARD_NAME); + public void onComplete(final Throwable failure, final Object response) { + if (failure != null) { + LOG.error("Failed to create {} shard", ENTITY_OWNERSHIP_SHARD_NAME, failure); } else { LOG.info("Successfully created {} shard", ENTITY_OWNERSHIP_SHARD_NAME); } } - }, datastore.getActorContext().getClientDispatcher()); + }, context.getClientDispatcher()); + + return new DistributedEntityOwnershipService(context); } private void executeEntityOwnershipShardOperation(final ActorRef shardActor, final Object message) { - Future future = datastore.getActorContext().executeOperationAsync(shardActor, message, MESSAGE_TIMEOUT); + Future future = context.executeOperationAsync(shardActor, message, MESSAGE_TIMEOUT); future.onComplete(new OnComplete() { @Override - public void onComplete(Throwable failure, Object response) { + public void onComplete(final Throwable failure, final Object response) { if(failure != null) { LOG.debug("Error sending message {} to {}", message, shardActor, failure); } else { LOG.debug("{} message to {} succeeded", message, shardActor, failure); } } - }, datastore.getActorContext().getClientDispatcher()); + }, context.getClientDispatcher()); } - private void executeLocalEntityOwnershipShardOperation(final Object message) { + @VisibleForTesting + void executeLocalEntityOwnershipShardOperation(final Object message) { if(localEntityOwnershipShard == null) { - Future future = datastore.getActorContext().findLocalShardAsync(ENTITY_OWNERSHIP_SHARD_NAME); + Future future = context.findLocalShardAsync(ENTITY_OWNERSHIP_SHARD_NAME); future.onComplete(new OnComplete() { @Override - public void onComplete(Throwable failure, ActorRef shardActor) { + public void onComplete(final Throwable failure, final ActorRef shardActor) { if(failure != null) { LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, failure); } else { @@ -121,7 +132,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService executeEntityOwnershipShardOperation(localEntityOwnershipShard, message); } } - }, datastore.getActorContext().getClientDispatcher()); + }, context.getClientDispatcher()); } else { executeEntityOwnershipShardOperation(localEntityOwnershipShard, message); @@ -129,7 +140,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public EntityOwnershipCandidateRegistration registerCandidate(Entity entity) + public EntityOwnershipCandidateRegistration registerCandidate(final Entity entity) throws CandidateAlreadyRegisteredException { Preconditions.checkNotNull(entity, "entity cannot be null"); @@ -145,7 +156,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService return new DistributedEntityOwnershipCandidateRegistration(entity, this); } - void unregisterCandidate(Entity entity) { + void unregisterCandidate(final Entity entity) { LOG.debug("Unregistering candidate for {}", entity); executeLocalEntityOwnershipShardOperation(new UnregisterCandidateLocal(entity)); @@ -153,7 +164,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public EntityOwnershipListenerRegistration registerListener(String entityType, EntityOwnershipListener listener) { + public EntityOwnershipListenerRegistration registerListener(final String entityType, final EntityOwnershipListener listener) { Preconditions.checkNotNull(entityType, "entityType cannot be null"); Preconditions.checkNotNull(listener, "listener cannot be null"); @@ -166,35 +177,48 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public Optional getOwnershipState(Entity forEntity) { + public Optional getOwnershipState(final Entity forEntity) { Preconditions.checkNotNull(forEntity, "forEntity cannot be null"); DataTree dataTree = getLocalEntityOwnershipShardDataTree(); - if(dataTree == null) { + if (dataTree == null) { return Optional.absent(); } Optional> entityNode = dataTree.takeSnapshot().readNode( entityPath(forEntity.getType(), forEntity.getId())); - if(!entityNode.isPresent()) { + if (!entityNode.isPresent()) { return Optional.absent(); } - String localMemberName = datastore.getActorContext().getCurrentMemberName(); - Optional> ownerLeaf = ((MapEntryNode)entityNode.get()). - getChild(ENTITY_OWNER_NODE_ID); + // Check if there are any candidates, if there are none we do not really have ownership state + final MapEntryNode entity = (MapEntryNode) entityNode.get(); + final Optional> optionalCandidates = entity.getChild(CANDIDATE_NODE_ID); + final boolean hasCandidates = optionalCandidates.isPresent() && ((MapNode) optionalCandidates.get()).getValue().size() > 0; + if(!hasCandidates){ + return Optional.absent(); + } + + MemberName localMemberName = context.getCurrentMemberName(); + Optional> ownerLeaf = entity.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); + boolean isOwner = hasOwner && localMemberName.getName().equals(owner); return Optional.of(new EntityOwnershipState(isOwner, hasOwner)); } - private DataTree getLocalEntityOwnershipShardDataTree() { - if(localEntityOwnershipShardDataTree == null) { + @Override + public boolean isCandidateRegistered(@Nonnull final Entity entity) { + return registeredEntities.get(entity) != null; + } + + @VisibleForTesting + DataTree getLocalEntityOwnershipShardDataTree() { + if (localEntityOwnershipShardDataTree == null) { try { if(localEntityOwnershipShard == null) { - localEntityOwnershipShard = Await.result(datastore.getActorContext().findLocalShardAsync( + localEntityOwnershipShard = Await.result(context.findLocalShardAsync( ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf()); } @@ -208,7 +232,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService return localEntityOwnershipShardDataTree; } - void unregisterListener(String entityType, EntityOwnershipListener listener) { + void unregisterListener(final String entityType, final EntityOwnershipListener listener) { LOG.debug("Unregistering listener {} for entity type {}", listener, entityType); executeLocalEntityOwnershipShardOperation(new UnregisterListenerLocal(listener, entityType)); @@ -218,9 +242,10 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService public void close() { } - protected EntityOwnershipShard.Builder newShardBuilder() { - return EntityOwnershipShard.newBuilder().localMemberName(datastore.getActorContext().getCurrentMemberName()) - .ownerSelectionStrategyConfig(EntityOwnerSelectionStrategyConfig.newBuilder().build()); + private static EntityOwnershipShard.Builder newShardBuilder(final ActorContext context, + final EntityOwnerSelectionStrategyConfig strategyConfig) { + return EntityOwnershipShard.newBuilder().localMemberName(context.getCurrentMemberName()) + .ownerSelectionStrategyConfig(strategyConfig); } @VisibleForTesting