import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.entityOwnersWithCandidate;
import akka.actor.ActorRef;
import akka.actor.ActorSelection;
+import akka.actor.Cancellable;
import akka.pattern.Patterns;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Optional;
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.EntityOwnerSelectionStrategy;
-import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyWrapper;
-import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.FirstCandidateSelectionStrategy;
+import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategyConfig;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
import org.opendaylight.controller.cluster.datastore.messages.PeerDown;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import scala.concurrent.Future;
+import scala.concurrent.duration.FiniteDuration;
/**
* Special Shard for EntityOwnership.
private final EntityOwnershipListenerSupport listenerSupport;
private final Set<String> downPeerMemberNames = new HashSet<>();
private final Map<String, String> peerIdToMemberNames = new HashMap<>();
- private final Map<String, EntityOwnerSelectionStrategyWrapper> ownerSelectionStrategies = new HashMap<>();
- private final EntityOwnerSelectionStrategyWrapper defaultEntityOwnerSelectionStrategy;
+ private EntityOwnerSelectionStrategyConfig strategyConfig;
+ private Map<YangInstanceIdentifier, Cancellable> entityToScheduledOwnershipTask = new HashMap<>();
private static DatastoreContext noPersistenceDatastoreContext(DatastoreContext datastoreContext) {
return DatastoreContext.newBuilderFrom(datastoreContext).persistent(false).build();
this.localMemberName = builder.localMemberName;
this.commitCoordinator = new EntityOwnershipShardCommitCoordinator(builder.localMemberName, LOG);
this.listenerSupport = new EntityOwnershipListenerSupport(getContext(), persistenceId());
- this.defaultEntityOwnerSelectionStrategy =
- createEntityOwnerSelectionStrategyWrapper(FirstCandidateSelectionStrategy.INSTANCE);
+ this.strategyConfig = EntityOwnerSelectionStrategyConfig.newBuilder().build();
for(String peerId: getRaftActorContext().getPeerIds()) {
ShardIdentifier shardId = ShardIdentifier.builder().fromShardIdString(peerId).build();
if(Strings.isNullOrEmpty(currentOwner)) {
writeNewOwner(selectOwner.getEntityPath(), newOwner(selectOwner.getAllCandidates(),
selectOwner.getOwnerSelectionStrategy()));
+
+ Cancellable cancellable = entityToScheduledOwnershipTask.get(selectOwner.getEntityPath());
+ if(cancellable != null){
+ if(!cancellable.isCancelled()){
+ cancellable.cancel();
+ }
+ entityToScheduledOwnershipTask.remove(selectOwner.getEntityPath());
+ }
}
}
String currentOwner = getCurrentOwner(message.getEntityPath());
if(message.getRemovedCandidate().equals(currentOwner)){
writeNewOwner(message.getEntityPath(),
- newOwner(message.getRemainingCandidates(), getEntityOwnerElectionStrategyWrapper(message.getEntityPath())));
+ newOwner(message.getRemainingCandidates(), getEntityOwnerElectionStrategy(message.getEntityPath())));
}
} else {
// We're not the leader. If the removed candidate is our local member then check if we actually
}
}
- private EntityOwnerSelectionStrategyWrapper getEntityOwnerElectionStrategyWrapper(YangInstanceIdentifier entityPath) {
- String entityType = EntityOwnersModel.entityTypeFromEntityPath(entityPath);
- EntityOwnerSelectionStrategyWrapper entityOwnerSelectionStrategy = ownerSelectionStrategies.get(entityType);
-
- if(entityOwnerSelectionStrategy == null){
- entityOwnerSelectionStrategy = defaultEntityOwnerSelectionStrategy;
- ownerSelectionStrategies.put(entityType, entityOwnerSelectionStrategy);
- }
-
- return entityOwnerSelectionStrategy;
+ private EntityOwnerSelectionStrategy getEntityOwnerElectionStrategy(YangInstanceIdentifier entityPath) {
+ final String entityType = EntityOwnersModel.entityTypeFromEntityPath(entityPath);
+ return strategyConfig.createStrategy(entityType);
}
private void onCandidateAdded(CandidateAdded message) {
downPeerMemberNames.remove(message.getNewCandidate());
String currentOwner = getCurrentOwner(message.getEntityPath());
+ EntityOwnerSelectionStrategy strategy = getEntityOwnerElectionStrategy(message.getEntityPath());
if(Strings.isNullOrEmpty(currentOwner)){
- EntityOwnerSelectionStrategyWrapper strategy = getEntityOwnerElectionStrategyWrapper(message.getEntityPath());
- if(strategy.selectionDelayInMillis() == 0L) {
+ if(strategy.getSelectionDelayInMillis() == 0L) {
writeNewOwner(message.getEntityPath(), newOwner(message.getAllCandidates(), strategy));
} else {
- strategy.scheduleOwnerSelection(message.getEntityPath(), message.getAllCandidates());
+ scheduleOwnerSelection(message.getEntityPath(), message.getAllCandidates(), strategy);
}
}
}
node(entityTypeNode.getIdentifier()).node(ENTITY_NODE_ID).node(entityNode.getIdentifier()).
node(ENTITY_OWNER_NODE_ID).build();
- Object newOwner = newOwner(getCandidateNames(entityNode), getEntityOwnerElectionStrategyWrapper(entityPath));
+ Object newOwner = newOwner(getCandidateNames(entityNode), getEntityOwnerElectionStrategy(entityPath));
LOG.debug("{}: Found entity {}, writing new owner {}", persistenceId(), entityPath, newOwner);
}
}
- private static Collection<String> getCandidateNames(MapEntryNode entity) {
- Collection<MapEntryNode> candidates = ((MapNode)entity.getChild(CANDIDATE_NODE_ID).get()).getValue();
+ private Collection<String> getCandidateNames(MapEntryNode entity) {
+ Collection<MapEntryNode> candidates = ((MapNode) entity.getChild(CANDIDATE_NODE_ID).get()).getValue();
Collection<String> candidateNames = new ArrayList<>(candidates.size());
for(MapEntryNode candidate: candidates) {
candidateNames.add(candidate.getChild(CANDIDATE_NAME_NODE_ID).get().getValue().toString());
ImmutableNodes.leafNode(ENTITY_OWNER_NODE_ID, newOwner)), this);
}
+ /**
+ * Schedule a new owner selection job. Cancelling any outstanding job if it has not been cancelled.
+ *
+ * @param entityPath
+ * @param allCandidates
+ */
+ public void scheduleOwnerSelection(YangInstanceIdentifier entityPath, Collection<String> allCandidates,
+ EntityOwnerSelectionStrategy strategy){
+ Cancellable lastScheduledTask = entityToScheduledOwnershipTask.get(entityPath);
+ if(lastScheduledTask != null && !lastScheduledTask.isCancelled()){
+ lastScheduledTask.cancel();
+ }
+ lastScheduledTask = context().system().scheduler().scheduleOnce(
+ FiniteDuration.apply(strategy.getSelectionDelayInMillis(), TimeUnit.MILLISECONDS)
+ , self(), new SelectOwner(entityPath, allCandidates, strategy)
+ , context().system().dispatcher(), self());
+
+ entityToScheduledOwnershipTask.put(entityPath, lastScheduledTask);
+ }
+
private String newOwner(Collection<String> candidates, EntityOwnerSelectionStrategy ownerSelectionStrategy) {
Collection<String> viableCandidates = getViableCandidates(candidates);
if(viableCandidates.size() == 0){
void onEntity(MapEntryNode entityTypeNode, MapEntryNode entityNode);
}
- private EntityOwnerSelectionStrategyWrapper createEntityOwnerSelectionStrategyWrapper(EntityOwnerSelectionStrategy entityOwnerSelectionStrategy){
- return new EntityOwnerSelectionStrategyWrapper(context().system().scheduler(), self(),
- context().system().dispatcher(), entityOwnerSelectionStrategy);
- }
-
@VisibleForTesting
- void addEntityOwnerSelectionStrategy(String entityType, Class<? extends EntityOwnerSelectionStrategy> ownerSelectionStrategyClass){
- try {
- EntityOwnerSelectionStrategyWrapper strategy =
- createEntityOwnerSelectionStrategyWrapper(ownerSelectionStrategyClass.newInstance());
- ownerSelectionStrategies.put(entityType, strategy);
- } catch (InstantiationException | IllegalAccessException e) {
- LOG.error("Exception occurred when adding election strategy", e);
- }
+ void addEntityOwnerSelectionStrategy(String entityType,
+ Class<? extends EntityOwnerSelectionStrategy> clazz,
+ long delay){
+ EntityOwnerSelectionStrategyConfig config = EntityOwnerSelectionStrategyConfig.newBuilder()
+ .addStrategy(entityType, clazz, delay).build();
+ this.strategyConfig = config;
}
public static Builder newBuilder() {
--- /dev/null
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class EntityOwnerSelectionStrategyConfig {
+ private static final Logger LOG = LoggerFactory.getLogger(EntityOwnerSelectionStrategyConfig.class);
+ private final Map<String, StrategyInfo> entityTypeToStrategyInfo = new HashMap<>();
+ private final Map<String, EntityOwnerSelectionStrategy> entityTypeToOwnerSelectionStrategy = new HashMap<>();
+
+ private EntityOwnerSelectionStrategyConfig(){
+
+ }
+
+ public EntityOwnerSelectionStrategy createStrategy(String entityType){
+ final EntityOwnerSelectionStrategy strategy;
+ final EntityOwnerSelectionStrategy existingStrategy = entityTypeToOwnerSelectionStrategy.get(entityType);
+ if(existingStrategy != null){
+ strategy = existingStrategy;
+ } else {
+ EntityOwnerSelectionStrategyConfig.StrategyInfo strategyInfo = entityTypeToStrategyInfo.get(entityType);
+ if(strategyInfo == null){
+ strategy = FirstCandidateSelectionStrategy.INSTANCE;
+ } else {
+ strategy = strategyInfo.createStrategy();
+ }
+ entityTypeToOwnerSelectionStrategy.put(entityType, strategy);
+ }
+ return strategy;
+
+ }
+
+ private static final class StrategyInfo {
+ private final Class<? extends EntityOwnerSelectionStrategy> strategyClass;
+ private final long delay;
+
+ private StrategyInfo(Class<? extends EntityOwnerSelectionStrategy> strategyClass, long delay) {
+ this.strategyClass = strategyClass;
+ this.delay = delay;
+ }
+
+ public EntityOwnerSelectionStrategy createStrategy(){
+ try {
+ return strategyClass.getDeclaredConstructor(long.class).newInstance(delay);
+ } catch (InstantiationException | IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+ LOG.warn("could not create custom strategy", e);
+ }
+ return FirstCandidateSelectionStrategy.INSTANCE;
+ }
+ }
+
+ public static Builder newBuilder(){
+ return new Builder(new EntityOwnerSelectionStrategyConfig());
+ }
+
+ public static class Builder {
+ private final EntityOwnerSelectionStrategyConfig config;
+
+ private Builder(EntityOwnerSelectionStrategyConfig config){
+ this.config = config;
+ }
+
+ public Builder addStrategy(String entityType, Class<? extends EntityOwnerSelectionStrategy> strategy, long delay){
+ config.entityTypeToStrategyInfo.put(entityType, new StrategyInfo(strategy, delay));
+ return this;
+ }
+
+ public EntityOwnerSelectionStrategyConfig build(){
+ return this.config;
+ }
+ }
+
+}
+++ /dev/null
-/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-
-package org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy;
-
-import akka.actor.ActorRef;
-import akka.actor.Cancellable;
-import akka.actor.Scheduler;
-import com.google.common.base.Preconditions;
-import java.util.Collection;
-import java.util.concurrent.TimeUnit;
-import org.opendaylight.controller.cluster.datastore.entityownership.messages.SelectOwner;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import scala.concurrent.ExecutionContextExecutor;
-import scala.concurrent.duration.FiniteDuration;
-
-/**
- * The EntityOwnerSelectionStrategyWrapper is an EntityOwnerSelectionStrategy decorator that adds the ability to
- * schedule an owner selection job.
- */
-public class EntityOwnerSelectionStrategyWrapper implements EntityOwnerSelectionStrategy {
- private final Scheduler scheduler;
- private final ActorRef shard;
- private final ExecutionContextExecutor dispatcher;
- private final EntityOwnerSelectionStrategy strategy;
-
- private Cancellable lastScheduledTask;
-
- public EntityOwnerSelectionStrategyWrapper(Scheduler scheduler,
- ActorRef shard,
- ExecutionContextExecutor dispatcher,
- EntityOwnerSelectionStrategy strategy) {
- this.scheduler = Preconditions.checkNotNull(scheduler);
- this.shard = Preconditions.checkNotNull(shard);
- this.dispatcher = Preconditions.checkNotNull(dispatcher);
- this.strategy = Preconditions.checkNotNull(strategy);
- }
-
- /**
- * Schedule a new owner selection job. Cancelling any outstanding job if it has not been cancelled.
- *
- * @param entityPath
- * @param allCandidates
- */
- public void scheduleOwnerSelection(YangInstanceIdentifier entityPath, Collection<String> allCandidates){
- if(lastScheduledTask != null && !lastScheduledTask.isCancelled()){
- lastScheduledTask.cancel();
- }
- lastScheduledTask = scheduler.scheduleOnce(
- FiniteDuration.apply(strategy.selectionDelayInMillis(), TimeUnit.MILLISECONDS)
- , shard, new SelectOwner(entityPath, allCandidates, strategy)
- , dispatcher, shard);
- }
-
- @Override
- public long selectionDelayInMillis(){
- return strategy.selectionDelayInMillis();
- }
-
- @Override
- public String newOwner(Collection<String> viableCandidates){
- return strategy.newOwner(viableCandidates);
- }
-}
\ No newline at end of file
Code Review / controller.git / commitdiff