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=3029ef7e399a4db99c6ed2ad18a7e7701cb2f8ee;hb=09b8efdb40105cd4cd3c21c9a9aea2c6687972be;hp=0a137e07df43a1bb7ca2fb3e854d7f63adfd46a3;hpb=2dc333588d0c15eb7f2df6223dcdcc15e05b077e;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..3029ef7e39 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,21 +8,18 @@ package org.opendaylight.controller.cluster.datastore; -import java.util.concurrent.TimeUnit; - -import akka.actor.ActorRef; import akka.actor.ActorSystem; - +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; - +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; 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.jmx.mbeans.DatastoreConfigurationMXBeanImpl; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; +import org.opendaylight.controller.cluster.datastore.utils.Dispatchers; 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; @@ -36,57 +33,76 @@ 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 { +public class DistributedDataStore implements DOMStore, SchemaContextListener, + DatastoreContextConfigAdminOverlay.Listener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStore.class); + private static final String UNKNOWN_TYPE = "unknown"; + + private static final long READY_WAIT_FACTOR = 3; private final ActorContext actorContext; - private final DatastoreContext datastoreContext; + private final long waitTillReadyTimeInMillis; + + + private AutoCloseable closeable; - public DistributedDataStore(ActorSystem actorSystem, String type, ClusterWrapper cluster, - Configuration configuration, DistributedDataStoreProperties dataStoreProperties) { + private DatastoreConfigurationMXBeanImpl datastoreConfigMXBean; + + private CountDownLatch waitTillReadyCountDownLatch = new CountDownLatch(1); + + private final String type; + + public DistributedDataStore(ActorSystem actorSystem, ClusterWrapper cluster, + Configuration configuration, DatastoreContext datastoreContext) { 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"); + Preconditions.checkNotNull(datastoreContext, "datastoreContext should not be null"); + this.type = datastoreContext.getDataStoreType(); 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)); + String shardDispatcher = + new Dispatchers(actorSystem.dispatchers()).getDispatcherPath(Dispatchers.DispatcherType.Shard); + + actorContext = new ActorContext(actorSystem, actorSystem.actorOf( + ShardManager.props(cluster, configuration, datastoreContext, waitTillReadyCountDownLatch) + .withDispatcher(shardDispatcher).withMailbox(ActorContext.MAILBOX), shardManagerId ), + cluster, configuration, datastoreContext); + + this.waitTillReadyTimeInMillis = + actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; - actorContext - = new ActorContext( - actorSystem, actorSystem.actorOf( - ShardManager.props(type, cluster, configuration, datastoreContext). - withMailbox(ActorContext.MAILBOX), shardManagerId ), cluster, configuration); - actorContext.setOperationTimeout(dataStoreProperties.getOperationTimeoutInSeconds()); + datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl(datastoreContext.getDataStoreMXBeanType()); + datastoreConfigMXBean.setContext(datastoreContext); + datastoreConfigMXBean.registerMBean(); } public DistributedDataStore(ActorContext actorContext) { this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); - this.datastoreContext = new DatastoreContext(); + this.type = UNKNOWN_TYPE; + this.waitTillReadyTimeInMillis = + actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; + } + public void setCloseable(AutoCloseable closeable) { + this.closeable = closeable; + } @SuppressWarnings("unchecked") @Override public >> ListenerRegistration registerChangeListener( - YangInstanceIdentifier path, L listener, + final YangInstanceIdentifier path, L listener, AsyncDataBroker.DataChangeScope scope) { Preconditions.checkNotNull(path, "path should not be null"); @@ -94,26 +110,13 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Au 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)); + final DataChangeListenerRegistrationProxy listenerRegistrationProxy = + new DataChangeListenerRegistrationProxy(shardName, actorContext, listener); + listenerRegistrationProxy.init(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); + return listenerRegistrationProxy; } @Override @@ -128,11 +131,13 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Au @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { + actorContext.acquireTxCreationPermit(); return new TransactionProxy(actorContext, TransactionProxy.TransactionType.WRITE_ONLY); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { + actorContext.acquireTxCreationPermit(); return new TransactionProxy(actorContext, TransactionProxy.TransactionType.READ_WRITE); } @@ -142,7 +147,47 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Au } @Override - public void close() throws Exception { + public void onDatastoreContextUpdated(DatastoreContext context) { + LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreType()); + + actorContext.setDatastoreContext(context); + datastoreConfigMXBean.setContext(context); + } + + @Override + public void close() { + datastoreConfigMXBean.unregisterMBean(); + + if(closeable != null) { + try { + closeable.close(); + } catch (Exception e) { + LOG.debug("Error closing insance", e); + } + } + actorContext.shutdown(); } + + @VisibleForTesting + ActorContext getActorContext() { + return actorContext; + } + + public void waitTillReady(){ + LOG.info("Beginning to wait for data store to become ready : {}", type); + + try { + waitTillReadyCountDownLatch.await(waitTillReadyTimeInMillis, TimeUnit.MILLISECONDS); + + LOG.debug("Data store {} is now ready", type); + } catch (InterruptedException e) { + LOG.error("Interrupted when trying to wait for shards to become leader in a reasonable amount of time - giving up"); + } + } + + @VisibleForTesting + public CountDownLatch getWaitTillReadyCountDownLatch() { + return waitTillReadyCountDownLatch; + } }