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%2FDistributedDataStore.java;h=479af79748033342041f32fe5221e68f78bf1c2f;hb=c74d5c2399e500fe3e690edc8cee497b1cb6f867;hp=29fc259bb75935d25f13dcb8f7a0865f74f145cd;hpb=9c0508d8b591e356f145d5d1a277c10965a647bb;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java index 29fc259bb7..479af79748 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DistributedDataStore.java @@ -9,14 +9,14 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorRef; -import akka.actor.ActorSelection; import akka.actor.ActorSystem; -import akka.util.Timeout; -import org.opendaylight.controller.cluster.datastore.messages.FindPrimary; -import org.opendaylight.controller.cluster.datastore.messages.PrimaryFound; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListener; import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListenerReply; import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext; +import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; +import org.opendaylight.controller.cluster.datastore.utils.ActorContext; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.sal.core.spi.data.DOMStore; @@ -25,116 +25,119 @@ import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransactio import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import scala.concurrent.Await; -import scala.concurrent.Future; -import scala.concurrent.duration.Duration; -import scala.concurrent.duration.FiniteDuration; -import java.util.concurrent.TimeUnit; - -import static akka.pattern.Patterns.ask; +import java.util.concurrent.Executors; /** * */ -public class DistributedDataStore implements DOMStore, SchemaContextListener { +public class DistributedDataStore implements DOMStore, SchemaContextListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStore.class); - final FiniteDuration ASK_DURATION = Duration.create(5, TimeUnit.SECONDS); - final Duration AWAIT_DURATION = Duration.create(5, TimeUnit.SECONDS); + private static final int DEFAULT_EXECUTOR_POOL_SIZE = 10; - private final ActorRef shardManager; - private final ActorSystem actorSystem; private final String type; + private final ActorContext actorContext; + private SchemaContext schemaContext; - public DistributedDataStore(ActorSystem actorSystem, String type) { - this.actorSystem = actorSystem; - this.type = type; - shardManager = actorSystem.actorOf(ShardManager.props(type)); - } - - @Override - public >> ListenerRegistration registerChangeListener( - InstanceIdentifier path, L listener, - AsyncDataBroker.DataChangeScope scope) { - ActorSelection primary = findPrimary(); - ActorRef dataChangeListenerActor = actorSystem.actorOf(DataChangeListener.props()); + /** + * Executor used to run FutureTask's + * + * This is typically used when we need to make a request to an actor and + * wait for it's response and the consumer needs to be provided a Future. + * + * FIXME : Make the thread pool size configurable. + */ + private final ListeningExecutorService executor = + MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(DEFAULT_EXECUTOR_POOL_SIZE)); - Object result = - getResult(primary, new RegisterChangeListener(path, dataChangeListenerActor.path(), - AsyncDataBroker.DataChangeScope.BASE), ASK_DURATION); + public DistributedDataStore(ActorSystem actorSystem, String type, ClusterWrapper cluster, Configuration configuration) { + this(new ActorContext(actorSystem, actorSystem + .actorOf(ShardManager.props(type, cluster, configuration), + "shardmanager-" + type), cluster, configuration), type); + } - RegisterChangeListenerReply reply = (RegisterChangeListenerReply) result; - return new ListenerRegistrationProxy(reply.getListenerRegistrationPath()); + public DistributedDataStore(ActorContext actorContext, String type) { + this.type = type; + this.actorContext = actorContext; } - private ActorSelection findPrimary() { - Object result = getResult(shardManager, new FindPrimary(Shard.DEFAULT_NAME), ASK_DURATION); - if(result instanceof PrimaryFound){ - PrimaryFound found = (PrimaryFound) result; - LOG.error("Primary found {}", found.getPrimaryPath()); + @Override + public >> ListenerRegistration registerChangeListener( + YangInstanceIdentifier path, L listener, + AsyncDataBroker.DataChangeScope scope) { + + ActorRef dataChangeListenerActor = actorContext.getActorSystem().actorOf( + DataChangeListener.props(schemaContext,listener,path )); - return actorSystem.actorSelection(found.getPrimaryPath()); - } - throw new RuntimeException("primary was not found"); - } + String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); - private Object getResult(ActorRef actor, Object message, FiniteDuration duration){ - Future future = - ask(actor, message, new Timeout(duration)); + Object result = actorContext.executeLocalShardOperation(shardName, + new RegisterChangeListener(path, dataChangeListenerActor.path(), + scope), + ActorContext.ASK_DURATION + ); - try { - return Await.result(future, AWAIT_DURATION); - } catch (Exception e) { - throw new RuntimeException(e); + if (result != null) { + RegisterChangeListenerReply reply = (RegisterChangeListenerReply) result; + return new DataChangeListenerRegistrationProxy(actorContext + .actorSelection(reply.getListenerRegistrationPath()), listener, + dataChangeListenerActor); } + + LOG.debug( + "No local shard for shardName {} was found so returning a noop registration", + shardName); + return new NoOpDataChangeListenerRegistration(listener); } - private Object getResult(ActorSelection actor, Object message, FiniteDuration duration){ - Future future = - ask(actor, message, new Timeout(duration)); - try { - return Await.result(future, AWAIT_DURATION); - } catch (Exception e) { - throw new RuntimeException(e); - } - } + @Override public DOMStoreTransactionChain createTransactionChain() { - return new TransactionChainProxy(); + return new TransactionChainProxy(actorContext, executor, schemaContext); } @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_ONLY, + executor, schemaContext); } @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { - return new TransactionProxy(); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY, + executor, schemaContext); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { - return new TransactionProxy(); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE, + executor, schemaContext); } @Override public void onGlobalContextUpdated(SchemaContext schemaContext) { - shardManager.tell(new UpdateSchemaContext(schemaContext), null); + this.schemaContext = schemaContext; + actorContext.getShardManager().tell( + new UpdateSchemaContext(schemaContext), null); + } + + @Override public void close() throws Exception { + actorContext.shutdown(); + } }