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=beee118a51b301f3be469a799ffc0fae78298dc0;hb=a3cecfd01d0ef8922530924e3ee9684eb03ee5d6;hp=8055be832de5d85ea89219dc1bde8ed6a98524af;hpb=4e3f49788c05730b29468deebc2aaa4ed0d94eef;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 8055be832d..beee118a51 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 @@ -10,6 +10,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; import akka.dispatch.OnComplete; import akka.pattern.Patterns; @@ -35,13 +36,13 @@ 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; -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.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; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListenerRegistration; +import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService; 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; @@ -60,14 +61,14 @@ import scala.concurrent.duration.Duration; * * @author Thomas Pantelis */ -public class DistributedEntityOwnershipService implements EntityOwnershipService, AutoCloseable { +public class DistributedEntityOwnershipService implements DOMEntityOwnershipService, AutoCloseable { @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 ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); + private final ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); private final ActorContext context; private volatile ActorRef localEntityOwnershipShard; @@ -109,10 +110,10 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService future.onComplete(new OnComplete() { @Override public void onComplete(final Throwable failure, final Object response) { - if(failure != null) { + if (failure != null) { LOG.debug("Error sending message {} to {}", message, shardActor, failure); } else { - LOG.debug("{} message to {} succeeded", message, shardActor, failure); + LOG.debug("{} message to {} succeeded", message, shardActor); } } }, context.getClientDispatcher()); @@ -120,12 +121,12 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService @VisibleForTesting void executeLocalEntityOwnershipShardOperation(final Object message) { - if(localEntityOwnershipShard == null) { + if (localEntityOwnershipShard == null) { Future future = context.findLocalShardAsync(ENTITY_OWNERSHIP_SHARD_NAME); future.onComplete(new OnComplete() { @Override public void onComplete(final Throwable failure, final ActorRef shardActor) { - if(failure != null) { + if (failure != null) { LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, failure); } else { localEntityOwnershipShard = shardActor; @@ -140,11 +141,11 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public EntityOwnershipCandidateRegistration registerCandidate(final Entity entity) + public DOMEntityOwnershipCandidateRegistration registerCandidate(final DOMEntity entity) throws CandidateAlreadyRegisteredException { Preconditions.checkNotNull(entity, "entity cannot be null"); - if(registeredEntities.putIfAbsent(entity, entity) != null) { + if (registeredEntities.putIfAbsent(entity, entity) != null) { throw new CandidateAlreadyRegisteredException(entity); } @@ -156,7 +157,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService return new DistributedEntityOwnershipCandidateRegistration(entity, this); } - void unregisterCandidate(final Entity entity) { + void unregisterCandidate(final DOMEntity entity) { LOG.debug("Unregistering candidate for {}", entity); executeLocalEntityOwnershipShardOperation(new UnregisterCandidateLocal(entity)); @@ -164,7 +165,8 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public EntityOwnershipListenerRegistration registerListener(final String entityType, final EntityOwnershipListener listener) { + public DOMEntityOwnershipListenerRegistration registerListener(final String entityType, + final DOMEntityOwnershipListener listener) { Preconditions.checkNotNull(entityType, "entityType cannot be null"); Preconditions.checkNotNull(listener, "listener cannot be null"); @@ -177,7 +179,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } @Override - public Optional getOwnershipState(final Entity forEntity) { + public Optional getOwnershipState(final DOMEntity forEntity) { Preconditions.checkNotNull(forEntity, "forEntity cannot be null"); DataTree dataTree = getLocalEntityOwnershipShardDataTree(); @@ -186,16 +188,18 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService } Optional> entityNode = dataTree.takeSnapshot().readNode( - entityPath(forEntity.getType(), forEntity.getId())); + entityPath(forEntity.getType(), forEntity.getIdentifier())); if (!entityNode.isPresent()) { return Optional.absent(); } // 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){ + final Optional> optionalCandidates = + entity.getChild(CANDIDATE_NODE_ID); + final boolean hasCandidates = optionalCandidates.isPresent() + && ((MapNode) optionalCandidates.get()).getValue().size() > 0; + if (!hasCandidates) { return Optional.absent(); } @@ -205,19 +209,20 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService boolean hasOwner = !Strings.isNullOrEmpty(owner); boolean isOwner = hasOwner && localMemberName.getName().equals(owner); - return Optional.of(new EntityOwnershipState(isOwner, hasOwner)); + return Optional.of(EntityOwnershipState.from(isOwner, hasOwner)); } @Override - public boolean isCandidateRegistered(@Nonnull final Entity entity) { + public boolean isCandidateRegistered(@Nonnull final DOMEntity entity) { return registeredEntities.get(entity) != null; } @VisibleForTesting + @SuppressWarnings("checkstyle:IllegalCatch") DataTree getLocalEntityOwnershipShardDataTree() { if (localEntityOwnershipShardDataTree == null) { try { - if(localEntityOwnershipShard == null) { + if (localEntityOwnershipShard == null) { localEntityOwnershipShard = Await.result(context.findLocalShardAsync( ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf()); } @@ -232,7 +237,7 @@ public class DistributedEntityOwnershipService implements EntityOwnershipService return localEntityOwnershipShardDataTree; } - void unregisterListener(final String entityType, final EntityOwnershipListener listener) { + void unregisterListener(final String entityType, final DOMEntityOwnershipListener listener) { LOG.debug("Unregistering listener {} for entity type {}", listener, entityType); executeLocalEntityOwnershipShardOperation(new UnregisterListenerLocal(listener, entityType));