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=ca9ef6338d2b769a7e9d6d57f2a7143ca4699ecb;hb=refs%2Fchanges%2F02%2F83802%2F42;hp=944d14a3d91b1c9441f6569689d1e43bb1f2e415;hpb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;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 944d14a3d9..ca9ef6338d 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 java.util.Objects.requireNonNull; 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; @@ -16,14 +17,14 @@ 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 edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; +import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; -import javax.annotation.Nonnull; +import java.util.concurrent.TimeoutException; import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.config.ModuleShardConfiguration; @@ -35,7 +36,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.cluster.datastore.utils.ActorUtils; import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException; import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState; import org.opendaylight.mdsal.eos.dom.api.DOMEntity; @@ -69,16 +70,16 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ private static final Timeout MESSAGE_TIMEOUT = new Timeout(1, TimeUnit.MINUTES); private final ConcurrentMap registeredEntities = new ConcurrentHashMap<>(); - private final ActorContext context; + private final ActorUtils context; private volatile ActorRef localEntityOwnershipShard; private volatile DataTree localEntityOwnershipShardDataTree; - DistributedEntityOwnershipService(final ActorContext context) { - this.context = Preconditions.checkNotNull(context); + DistributedEntityOwnershipService(final ActorUtils context) { + this.context = requireNonNull(context); } - public static DistributedEntityOwnershipService start(final ActorContext context, + public static DistributedEntityOwnershipService start(final ActorUtils context, final EntityOwnerSelectionStrategyConfig strategyConfig) { ActorRef shardManagerActor = context.getShardManager(); @@ -88,9 +89,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ "entity-owners", ENTITY_OWNERSHIP_SHARD_NAME, ModuleShardStrategy.NAME, entityOwnersMemberNames), newShardBuilder(context, strategyConfig), null); - Future createFuture = context.executeOperationAsync(shardManagerActor, - createShard, MESSAGE_TIMEOUT); - + Future createFuture = context.executeOperationAsync(shardManagerActor, createShard, MESSAGE_TIMEOUT); createFuture.onComplete(new OnComplete() { @Override public void onComplete(final Throwable failure, final Object response) { @@ -111,7 +110,8 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @Override public void onComplete(final Throwable failure, final Object response) { if (failure != null) { - LOG.debug("Error sending message {} to {}", message, shardActor, failure); + // FIXME: CONTROLLER-1904: reduce the severity to info once we have a retry mechanism + LOG.error("Error sending message {} to {}", message, shardActor, failure); } else { LOG.debug("{} message to {} succeeded", message, shardActor); } @@ -127,6 +127,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @Override public void onComplete(final Throwable failure, final ActorRef shardActor) { if (failure != null) { + // FIXME: CONTROLLER-1904: reduce the severity to info once we have a retry mechanism LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, failure); } else { localEntityOwnershipShard = shardActor; @@ -143,7 +144,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @Override public DOMEntityOwnershipCandidateRegistration registerCandidate(final DOMEntity entity) throws CandidateAlreadyRegisteredException { - Preconditions.checkNotNull(entity, "entity cannot be null"); + requireNonNull(entity, "entity cannot be null"); if (registeredEntities.putIfAbsent(entity, entity) != null) { throw new CandidateAlreadyRegisteredException(entity); @@ -167,9 +168,6 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @Override public DOMEntityOwnershipListenerRegistration registerListener(final String entityType, final DOMEntityOwnershipListener listener) { - Preconditions.checkNotNull(entityType, "entityType cannot be null"); - Preconditions.checkNotNull(listener, "listener cannot be null"); - RegisterListenerLocal registerListener = new RegisterListenerLocal(listener, entityType); LOG.debug("Registering listener with message: {}", registerListener); @@ -180,17 +178,17 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ @Override public Optional getOwnershipState(final DOMEntity forEntity) { - Preconditions.checkNotNull(forEntity, "forEntity cannot be null"); + requireNonNull(forEntity, "forEntity cannot be null"); DataTree dataTree = getLocalEntityOwnershipShardDataTree(); if (dataTree == null) { - return Optional.absent(); + return Optional.empty(); } Optional> entityNode = dataTree.takeSnapshot().readNode( entityPath(forEntity.getType(), forEntity.getIdentifier())); if (!entityNode.isPresent()) { - return Optional.absent(); + return Optional.empty(); } // Check if there are any candidates, if there are none we do not really have ownership state @@ -200,7 +198,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ final boolean hasCandidates = optionalCandidates.isPresent() && ((MapNode) optionalCandidates.get()).getValue().size() > 0; if (!hasCandidates) { - return Optional.absent(); + return Optional.empty(); } MemberName localMemberName = context.getCurrentMemberName(); @@ -213,28 +211,36 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ } @Override - public boolean isCandidateRegistered(@Nonnull final DOMEntity entity) { + public boolean isCandidateRegistered(final DOMEntity entity) { return registeredEntities.get(entity) != null; } @VisibleForTesting @SuppressWarnings("checkstyle:IllegalCatch") + @SuppressFBWarnings(value = "REC_CATCH_EXCEPTION", justification = "Akka's Await.result() API contract") DataTree getLocalEntityOwnershipShardDataTree() { - if (localEntityOwnershipShardDataTree == null) { - try { - if (localEntityOwnershipShard == null) { - localEntityOwnershipShard = Await.result(context.findLocalShardAsync( - ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf()); - } + final DataTree local = localEntityOwnershipShardDataTree; + if (local != null) { + return local; + } - localEntityOwnershipShardDataTree = (DataTree) Await.result(Patterns.ask(localEntityOwnershipShard, - GetShardDataTree.INSTANCE, MESSAGE_TIMEOUT), Duration.Inf()); - } catch (Exception e) { + if (localEntityOwnershipShard == null) { + try { + localEntityOwnershipShard = Await.result(context.findLocalShardAsync( + ENTITY_OWNERSHIP_SHARD_NAME), Duration.Inf()); + } catch (TimeoutException | InterruptedException e) { LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e); + return null; } } - return localEntityOwnershipShardDataTree; + try { + return localEntityOwnershipShardDataTree = (DataTree) Await.result(Patterns.ask(localEntityOwnershipShard, + GetShardDataTree.INSTANCE, MESSAGE_TIMEOUT), Duration.Inf()); + } catch (TimeoutException | InterruptedException e) { + LOG.error("Failed to find local {} shard", ENTITY_OWNERSHIP_SHARD_NAME, e); + return null; + } } void unregisterListener(final String entityType, final DOMEntityOwnershipListener listener) { @@ -247,7 +253,7 @@ public class DistributedEntityOwnershipService implements DOMEntityOwnershipServ public void close() { } - private static EntityOwnershipShard.Builder newShardBuilder(final ActorContext context, + private static EntityOwnershipShard.Builder newShardBuilder(final ActorUtils context, final EntityOwnerSelectionStrategyConfig strategyConfig) { return EntityOwnershipShard.newBuilder().localMemberName(context.getCurrentMemberName()) .ownerSelectionStrategyConfig(strategyConfig);