*/
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;
+
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.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
-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;
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.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;
+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;
*
* @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<Entity, Entity> registeredEntities = new ConcurrentHashMap<>();
- private final ActorContext context;
+ private final ConcurrentMap<DOMEntity, DOMEntity> registeredEntities = new ConcurrentHashMap<>();
+ private final ActorUtils context;
private volatile ActorRef localEntityOwnershipShard;
private volatile DataTree localEntityOwnershipShardDataTree;
- private 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();
Configuration configuration = context.getConfiguration();
- Collection<String> entityOwnersMemberNames = configuration.getUniqueMemberNamesForAllShards();
+ Collection<MemberName> entityOwnersMemberNames = configuration.getUniqueMemberNamesForAllShards();
CreateShard createShard = new CreateShard(new ModuleShardConfiguration(EntityOwners.QNAME.getNamespace(),
"entity-owners", ENTITY_OWNERSHIP_SHARD_NAME, ModuleShardStrategy.NAME, entityOwnersMemberNames),
newShardBuilder(context, strategyConfig), null);
- Future<Object> createFuture = context.executeOperationAsync(shardManagerActor,
- createShard, MESSAGE_TIMEOUT);
-
+ Future<Object> createFuture = context.executeOperationAsync(shardManagerActor, createShard, MESSAGE_TIMEOUT);
createFuture.onComplete(new OnComplete<Object>() {
@Override
public void onComplete(final Throwable failure, final Object response) {
future.onComplete(new OnComplete<Object>() {
@Override
public void onComplete(final Throwable failure, final Object response) {
- if(failure != null) {
- LOG.debug("Error sending message {} to {}", message, shardActor, failure);
+ if (failure != null) {
+ // 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, failure);
+ LOG.debug("{} message to {} succeeded", message, shardActor);
}
}
}, context.getClientDispatcher());
@VisibleForTesting
void executeLocalEntityOwnershipShardOperation(final Object message) {
- if(localEntityOwnershipShard == null) {
+ if (localEntityOwnershipShard == null) {
Future<ActorRef> future = context.findLocalShardAsync(ENTITY_OWNERSHIP_SHARD_NAME);
future.onComplete(new OnComplete<ActorRef>() {
@Override
public void onComplete(final Throwable failure, final ActorRef shardActor) {
- if(failure != null) {
+ 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;
}
@Override
- public EntityOwnershipCandidateRegistration registerCandidate(final Entity entity)
+ 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) {
+ if (registeredEntities.putIfAbsent(entity, entity) != null) {
throw new CandidateAlreadyRegisteredException(entity);
}
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));
}
@Override
- public EntityOwnershipListenerRegistration registerListener(final String entityType, final EntityOwnershipListener listener) {
- Preconditions.checkNotNull(entityType, "entityType cannot be null");
- Preconditions.checkNotNull(listener, "listener cannot be null");
-
+ public DOMEntityOwnershipListenerRegistration registerListener(final String entityType,
+ final DOMEntityOwnershipListener listener) {
RegisterListenerLocal registerListener = new RegisterListenerLocal(listener, entityType);
LOG.debug("Registering listener with message: {}", registerListener);
}
@Override
- public Optional<EntityOwnershipState> getOwnershipState(final Entity forEntity) {
- Preconditions.checkNotNull(forEntity, "forEntity cannot be null");
+ public Optional<EntityOwnershipState> getOwnershipState(final DOMEntity forEntity) {
+ requireNonNull(forEntity, "forEntity cannot be null");
DataTree dataTree = getLocalEntityOwnershipShardDataTree();
if (dataTree == null) {
- return Optional.absent();
+ return Optional.empty();
}
Optional<NormalizedNode<?, ?>> entityNode = dataTree.takeSnapshot().readNode(
- entityPath(forEntity.getType(), forEntity.getId()));
+ 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
final MapEntryNode entity = (MapEntryNode) entityNode.get();
- final Optional<DataContainerChild<? extends PathArgument, ?>> optionalCandidates = entity.getChild(CANDIDATE_NODE_ID);
- final boolean hasCandidates = optionalCandidates.isPresent() && ((MapNode) optionalCandidates.get()).getValue().size() > 0;
- if(!hasCandidates){
- return Optional.absent();
+ final Optional<DataContainerChild<? extends PathArgument, ?>> optionalCandidates =
+ entity.getChild(CANDIDATE_NODE_ID);
+ final boolean hasCandidates = optionalCandidates.isPresent()
+ && ((MapNode) optionalCandidates.get()).getValue().size() > 0;
+ if (!hasCandidates) {
+ return Optional.empty();
}
- String localMemberName = context.getCurrentMemberName();
+ MemberName localMemberName = context.getCurrentMemberName();
Optional<DataContainerChild<? extends PathArgument, ?>> 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));
+ return Optional.of(EntityOwnershipState.from(isOwner, hasOwner));
}
@Override
- public boolean isCandidateRegistered(@Nonnull final Entity entity) {
+ public boolean isCandidateRegistered(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());
}
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));
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);
Code Review / controller.git / blobdiff