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=0a137e07df43a1bb7ca2fb3e854d7f63adfd46a3;hpb=f71a2c712690ecfd1260543ab58d8e16453f7918;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 0a137e07df..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,141 +8,63 @@ 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 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.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.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.duration.Duration; +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 final ActorContext actorContext; - private final DatastoreContext datastoreContext; +public class DistributedDataStore extends AbstractDataStore { - public DistributedDataStore(ActorSystem actorSystem, String type, ClusterWrapper cluster, - 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"); - Preconditions.checkNotNull(configuration, "configuration should not be null"); + private final TransactionContextFactory txContextFactory; - - String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); - - LOG.info("Creating ShardManager : {}", shardManagerId); - - 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(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"); - this.datastoreContext = new DatastoreContext(); + @VisibleForTesting + DistributedDataStore(final ActorUtils actorUtils, final ClientIdentifier identifier) { + super(actorUtils, identifier); + this.txContextFactory = new TransactionContextFactory(getActorUtils(), getIdentifier()); } - @SuppressWarnings("unchecked") - @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(listener )); - - String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); - - Object result = actorContext.executeLocalShardOperation(shardName, - new RegisterChangeListener(path, dataChangeListenerActor.path(), scope)); - - 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); + return txContextFactory.createTransactionChain(); } @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_ONLY); + return new TransactionProxy(txContextFactory, TransactionType.READ_ONLY); } @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY); + getActorUtils().acquireTxCreationPermit(); + return new TransactionProxy(txContextFactory, TransactionType.WRITE_ONLY); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { - return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE); - } - - @Override - public void onGlobalContextUpdated(SchemaContext schemaContext) { - actorContext.setSchemaContext(schemaContext); + getActorUtils().acquireTxCreationPermit(); + return new TransactionProxy(txContextFactory, TransactionType.READ_WRITE); } @Override - public void close() throws Exception { - actorContext.shutdown(); + public void close() { + txContextFactory.close(); + super.close(); } }