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=202ced9a26512047f57ee8ad2b0ced7e61366771;hb=3927509ec3ecfa32a51b725d2b7155d425f5b877;hp=3c760f35b8a671be81239e48ef6936a1e065c065;hpb=1af23ad8e572896323ed5d1c723d977a16eb7e6d;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 3c760f35b8..434efc9111 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,12 +8,14 @@ package org.opendaylight.controller.cluster.datastore; -import akka.actor.ActorRef; import akka.actor.ActorSystem; -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 com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; +import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier; +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.sal.core.spi.data.DOMStore; @@ -22,7 +24,7 @@ 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; @@ -34,42 +36,69 @@ import org.slf4j.LoggerFactory; */ public class DistributedDataStore implements DOMStore, SchemaContextListener, AutoCloseable { - private static final Logger - LOG = LoggerFactory.getLogger(DistributedDataStore.class); + private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStore.class); + public static final int REGISTER_DATA_CHANGE_LISTENER_TIMEOUT_FACTOR = 24; // 24 times the usual operation timeout - - private final String type; private final ActorContext actorContext; - public DistributedDataStore(ActorSystem actorSystem, String type) { - this(new ActorContext(actorSystem, actorSystem.actorOf(ShardManager.props(type))), type); + private AutoCloseable closeable; + + private DatastoreConfigurationMXBeanImpl datastoreConfigMXBean; + + public DistributedDataStore(ActorSystem actorSystem, ClusterWrapper cluster, + Configuration configuration, DatastoreContext datastoreContext) { + Preconditions.checkNotNull(actorSystem, "actorSystem 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"); + + String type = datastoreContext.getDataStoreType(); + + String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); + + LOG.info("Creating ShardManager : {}", shardManagerId); + + String shardDispatcher = + new Dispatchers(actorSystem.dispatchers()).getDispatcherPath(Dispatchers.DispatcherType.Shard); + + actorContext = new ActorContext(actorSystem, actorSystem.actorOf( + ShardManager.props(cluster, configuration, datastoreContext) + .withDispatcher(shardDispatcher).withMailbox(ActorContext.MAILBOX), shardManagerId ), + cluster, configuration, datastoreContext); + + datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl(datastoreContext.getDataStoreMXBeanType()); + datastoreConfigMXBean.setContext(datastoreContext); + datastoreConfigMXBean.registerMBean(); } - public DistributedDataStore(ActorContext actorContext, String type) { - this.type = type; - this.actorContext = actorContext; + public DistributedDataStore(ActorContext actorContext) { + this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); } + public void setCloseable(AutoCloseable closeable) { + this.closeable = closeable; + } + @SuppressWarnings("unchecked") @Override - public >> ListenerRegistration registerChangeListener( - InstanceIdentifier path, L listener, + public >> + ListenerRegistration registerChangeListener( + final YangInstanceIdentifier path, L listener, AsyncDataBroker.DataChangeScope scope) { - ActorRef dataChangeListenerActor = actorContext.getActorSystem().actorOf( - DataChangeListener.props()); + Preconditions.checkNotNull(path, "path should not be null"); + Preconditions.checkNotNull(listener, "listener should not be null"); - Object result = actorContext.executeShardOperation(Shard.DEFAULT_NAME, - new RegisterChangeListener(path, dataChangeListenerActor.path(), - AsyncDataBroker.DataChangeScope.BASE), - ActorContext.ASK_DURATION - ); + LOG.debug("Registering listener: {} for path: {} scope: {}", listener, path, scope); - RegisterChangeListenerReply reply = (RegisterChangeListenerReply) result; - return new DataChangeListenerRegistrationProxy(actorContext.actorSelection(reply.getListenerRegistrationPath()), listener); - } + String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); + final DataChangeListenerRegistrationProxy listenerRegistrationProxy = + new DataChangeListenerRegistrationProxy(shardName, actorContext, listener); + listenerRegistrationProxy.init(path, scope); + return listenerRegistrationProxy; + } @Override public DOMStoreTransactionChain createTransactionChain() { @@ -83,21 +112,38 @@ 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); } - @Override public void onGlobalContextUpdated(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() { + datastoreConfigMXBean.unregisterMBean(); + + if(closeable != null) { + try { + closeable.close(); + } catch (Exception e) { + LOG.debug("Error closing insance", e); + } + } + actorContext.shutdown(); + } + @VisibleForTesting + ActorContext getActorContext() { + return actorContext; } }