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=16198ff544f35ef995e510dee189c0af2ce25f5e;hb=55a9b9f42a14c56060f74b38f84d444c0fbfecc4;hp=4fa26ffb2033407efb5b1fc1c86f96d04e4e3dd7;hpb=efbeac00372d85440d46e2e5e04b124036ad3721;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 4fa26ffb20..16198ff544 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 @@ -8,163 +8,63 @@ package org.opendaylight.controller.cluster.datastore; -import akka.actor.ActorRef; import akka.actor.ActorSystem; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier; -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.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -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.util.PropertyUtils; -import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; -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 com.google.common.annotations.VisibleForTesting; +import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; +import org.opendaylight.controller.cluster.datastore.config.Configuration; +import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot; +import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; /** - * + * Implements a distributed DOMStore using Akka Patterns.ask(). */ -public class DistributedDataStore implements DOMStore, SchemaContextListener, AutoCloseable { - - private static final Logger - LOG = LoggerFactory.getLogger(DistributedDataStore.class); - - private static final String EXECUTOR_MAX_POOL_SIZE_PROP = - "mdsal.dist-datastore-executor-pool.size"; - private static final int DEFAULT_EXECUTOR_MAX_POOL_SIZE = 10; - - private static final String EXECUTOR_MAX_QUEUE_SIZE_PROP = - "mdsal.dist-datastore-executor-queue.size"; - private static final int DEFAULT_EXECUTOR_MAX_QUEUE_SIZE = 5000; - - private final ActorContext actorContext; - - private SchemaContext schemaContext; - - /** - * 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. - */ - private final ListeningExecutorService executor = - MoreExecutors.listeningDecorator( - SpecialExecutors.newBlockingBoundedFastThreadPool( - PropertyUtils.getIntSystemProperty( - EXECUTOR_MAX_POOL_SIZE_PROP, - DEFAULT_EXECUTOR_MAX_POOL_SIZE), - PropertyUtils.getIntSystemProperty( - EXECUTOR_MAX_QUEUE_SIZE_PROP, - DEFAULT_EXECUTOR_MAX_QUEUE_SIZE), "DistDataStore")); - - public DistributedDataStore(ActorSystem actorSystem, String type, ClusterWrapper cluster, - Configuration configuration, InMemoryDOMDataStoreConfigProperties dataStoreProperties) { - Preconditions.checkNotNull(actorSystem, "actorSystem should not be null"); - Preconditions.checkNotNull(type, "type should not be null"); - Preconditions.checkNotNull(cluster, "cluster should not be null"); - Preconditions.checkNotNull(configuration, "configuration should not be null"); +public class DistributedDataStore extends AbstractDataStore { + private final TransactionContextFactory txContextFactory; - String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); - - LOG.info("Creating ShardManager : {}", shardManagerId); - - this.actorContext = new ActorContext(actorSystem, actorSystem - .actorOf(ShardManager.props(type, cluster, configuration, dataStoreProperties), - shardManagerId ), cluster, configuration); + public DistributedDataStore(final ActorSystem actorSystem, final ClusterWrapper cluster, + final Configuration configuration, final DatastoreContextFactory datastoreContextFactory, + final DatastoreSnapshot restoreFromSnapshot) { + super(actorSystem, cluster, configuration, datastoreContextFactory, restoreFromSnapshot); + this.txContextFactory = new TransactionContextFactory(getActorUtils(), getIdentifier()); } - public DistributedDataStore(ActorContext actorContext) { - this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); + @VisibleForTesting + DistributedDataStore(final ActorUtils actorUtils, final ClientIdentifier identifier) { + super(actorUtils, identifier); + this.txContextFactory = new TransactionContextFactory(getActorUtils(), getIdentifier()); } - @Override - public >> ListenerRegistration registerChangeListener( - YangInstanceIdentifier path, L listener, - AsyncDataBroker.DataChangeScope scope) { - - Preconditions.checkNotNull(path, "path should not be null"); - Preconditions.checkNotNull(listener, "listener should not be null"); - - - LOG.debug("Registering listener: {} for path: {} scope: {}", listener, path, scope); - - ActorRef dataChangeListenerActor = actorContext.getActorSystem().actorOf( - DataChangeListener.props(schemaContext,listener,path )); - - String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); - - Object result = actorContext.executeLocalShardOperation(shardName, - new RegisterChangeListener(path, dataChangeListenerActor.path(), - scope), - ActorContext.ASK_DURATION - ); - - 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); - } - - - - - @Override public DOMStoreTransactionChain createTransactionChain() { - return new TransactionChainProxy(actorContext, executor, schemaContext); + return txContextFactory.createTransactionChain(); } @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_ONLY, - executor, schemaContext); + return new TransactionProxy(txContextFactory, TransactionType.READ_ONLY); } @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY, - executor, schemaContext); + getActorUtils().acquireTxCreationPermit(); + return new TransactionProxy(txContextFactory, TransactionType.WRITE_ONLY); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE, - executor, schemaContext); + getActorUtils().acquireTxCreationPermit(); + return new TransactionProxy(txContextFactory, TransactionType.READ_WRITE); } - @Override public void onGlobalContextUpdated(SchemaContext schemaContext) { - this.schemaContext = schemaContext; - actorContext.getShardManager().tell( - new UpdateSchemaContext(schemaContext), null); - } - - @Override public void close() throws Exception { - actorContext.shutdown(); - + @Override + public void close() { + txContextFactory.close(); + super.close(); } }