X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDistributedDataStore.java;h=0a137e07df43a1bb7ca2fb3e854d7f63adfd46a3;hp=4fa26ffb2033407efb5b1fc1c86f96d04e4e3dd7;hb=f71a2c712690ecfd1260543ab58d8e16453f7918;hpb=57769930716e9e5a55336145998525d3392c0ed8 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..0a137e07df 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,15 +8,16 @@ package org.opendaylight.controller.cluster.datastore; +import java.util.concurrent.TimeUnit; + 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; @@ -28,8 +29,6 @@ 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.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; @@ -37,44 +36,20 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import scala.concurrent.duration.Duration; + /** * */ 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 static final Logger LOG = LoggerFactory.getLogger(DistributedDataStore.class); 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")); + private final DatastoreContext datastoreContext; public DistributedDataStore(ActorSystem actorSystem, String type, ClusterWrapper cluster, - Configuration configuration, InMemoryDOMDataStoreConfigProperties dataStoreProperties) { + Configuration configuration, DistributedDataStoreProperties 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"); @@ -85,37 +60,47 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Au LOG.info("Creating ShardManager : {}", shardManagerId); - this.actorContext = new ActorContext(actorSystem, actorSystem - .actorOf(ShardManager.props(type, cluster, configuration, dataStoreProperties), - shardManagerId ), cluster, configuration); + datastoreContext = new DatastoreContext(InMemoryDOMDataStoreConfigProperties.create( + dataStoreProperties.getMaxShardDataChangeExecutorPoolSize(), + dataStoreProperties.getMaxShardDataChangeExecutorQueueSize(), + dataStoreProperties.getMaxShardDataChangeListenerQueueSize()), + Duration.create(dataStoreProperties.getShardTransactionIdleTimeoutInMinutes(), + TimeUnit.MINUTES)); + + actorContext + = new ActorContext( + actorSystem, actorSystem.actorOf( + ShardManager.props(type, cluster, configuration, datastoreContext). + withMailbox(ActorContext.MAILBOX), shardManagerId ), cluster, configuration); + + actorContext.setOperationTimeout(dataStoreProperties.getOperationTimeoutInSeconds()); } public DistributedDataStore(ActorContext actorContext) { this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); + this.datastoreContext = new DatastoreContext(); } + @SuppressWarnings("unchecked") @Override - public >> ListenerRegistration registerChangeListener( + 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 )); + DataChangeListener.props(listener )); String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); Object result = actorContext.executeLocalShardOperation(shardName, - new RegisterChangeListener(path, dataChangeListenerActor.path(), - scope), - ActorContext.ASK_DURATION - ); + new RegisterChangeListener(path, dataChangeListenerActor.path(), scope)); if (result != null) { RegisterChangeListenerReply reply = (RegisterChangeListenerReply) result; @@ -127,44 +112,37 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Au 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 new TransactionChainProxy(actorContext); } @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_ONLY, - executor, schemaContext); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_ONLY); } @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY, - executor, schemaContext); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE, - executor, schemaContext); + return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE); } - @Override public void onGlobalContextUpdated(SchemaContext schemaContext) { - this.schemaContext = schemaContext; - actorContext.getShardManager().tell( - new UpdateSchemaContext(schemaContext), null); + @Override + public void onGlobalContextUpdated(SchemaContext schemaContext) { + actorContext.setSchemaContext(schemaContext); } - @Override public void close() throws Exception { + @Override + public void close() throws Exception { actorContext.shutdown(); - } }