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=198c3b2edaa137e6a2b6c5d32d14a1b00798106b;hp=8051f7d49bab43e48ad1a82215d35b49a55281e5;hb=d3358dde361ed5bd94466ded15dac0bba45afe9c;hpb=db0dbb7e7976efc860012dfdba61d5416d45900c 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 8051f7d49b..198c3b2eda 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 @@ -15,12 +15,15 @@ import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Uninterruptibles; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.opendaylight.controller.cluster.datastore.config.Configuration; import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.DatastoreConfigurationMXBeanImpl; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.DatastoreInfoMXBeanImpl; -import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; +import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot; +import org.opendaylight.controller.cluster.datastore.shardmanager.ShardManagerCreator; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; import org.opendaylight.controller.cluster.datastore.utils.Dispatchers; +import org.opendaylight.controller.cluster.datastore.utils.PrimaryShardInfoFutureCache; 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.api.DOMDataTreeChangeListener; @@ -52,7 +55,6 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, private final ActorContext actorContext; private final long waitTillReadyTimeInMillis; - private AutoCloseable closeable; private DatastoreConfigurationMXBeanImpl datastoreConfigMXBean; @@ -63,14 +65,17 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, private final String type; + private final TransactionContextFactory txContextFactory; + public DistributedDataStore(ActorSystem actorSystem, ClusterWrapper cluster, - Configuration configuration, DatastoreContext datastoreContext) { + Configuration configuration, DatastoreContextFactory datastoreContextFactory, + DatastoreSnapshot restoreFromSnapshot) { 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"); + Preconditions.checkNotNull(datastoreContextFactory, "datastoreContextFactory should not be null"); - this.type = datastoreContext.getDataStoreType(); + this.type = datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(); String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); @@ -79,27 +84,37 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, String shardDispatcher = new Dispatchers(actorSystem.dispatchers()).getDispatcherPath(Dispatchers.DispatcherType.Shard); - actorContext = new ActorContext(actorSystem, createShardManager(actorSystem, cluster, configuration, - datastoreContext, shardDispatcher, shardManagerId ), cluster, configuration, datastoreContext); + PrimaryShardInfoFutureCache primaryShardInfoCache = new PrimaryShardInfoFutureCache(); + + ShardManagerCreator creator = new ShardManagerCreator().cluster(cluster).configuration(configuration). + datastoreContextFactory(datastoreContextFactory).waitTillReadyCountdownLatch(waitTillReadyCountDownLatch). + primaryShardInfoCache(primaryShardInfoCache).restoreFromSnapshot(restoreFromSnapshot); + + actorContext = new ActorContext(actorSystem, createShardManager(actorSystem, creator, shardDispatcher, + shardManagerId), cluster, configuration, datastoreContextFactory.getBaseDatastoreContext(), primaryShardInfoCache); this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; + this.txContextFactory = TransactionContextFactory.create(actorContext); - datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl(datastoreContext.getDataStoreMXBeanType()); - datastoreConfigMXBean.setContext(datastoreContext); + datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl( + datastoreContextFactory.getBaseDatastoreContext().getDataStoreMXBeanType()); + datastoreConfigMXBean.setContext(datastoreContextFactory.getBaseDatastoreContext()); datastoreConfigMXBean.registerMBean(); - datastoreInfoMXBean = new DatastoreInfoMXBeanImpl(datastoreContext.getDataStoreMXBeanType(), actorContext); + datastoreInfoMXBean = new DatastoreInfoMXBeanImpl(datastoreContextFactory.getBaseDatastoreContext(). + getDataStoreMXBeanType(), actorContext); datastoreInfoMXBean.registerMBean(); } - public DistributedDataStore(ActorContext actorContext) { + @VisibleForTesting + DistributedDataStore(ActorContext actorContext) { this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); + this.txContextFactory = TransactionContextFactory.create(actorContext); this.type = UNKNOWN_TYPE; this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; - } public void setCloseable(AutoCloseable closeable) { @@ -118,7 +133,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, LOG.debug("Registering listener: {} for path: {} scope: {}", listener, path, scope); - String shardName = ShardStrategyFactory.getStrategy(path).findShard(path); + String shardName = actorContext.getShardStrategyFactory().getStrategy(path).findShard(path); final DataChangeListenerRegistrationProxy listenerRegistrationProxy = new DataChangeListenerRegistrationProxy(shardName, actorContext, listener); @@ -132,7 +147,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Preconditions.checkNotNull(treeId, "treeId should not be null"); Preconditions.checkNotNull(listener, "listener should not be null"); - final String shardName = ShardStrategyFactory.getStrategy(treeId).findShard(treeId); + final String shardName = actorContext.getShardStrategyFactory().getStrategy(treeId).findShard(treeId); LOG.debug("Registering tree listener: {} for tree: {} shard: {}", listener, treeId, shardName); final DataTreeChangeListenerProxy listenerRegistrationProxy = @@ -144,24 +159,24 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, @Override public DOMStoreTransactionChain createTransactionChain() { - return new TransactionChainProxy(actorContext); + return txContextFactory.createTransactionChain(); } @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(actorContext, TransactionType.READ_ONLY); + return new TransactionProxy(txContextFactory, TransactionType.READ_ONLY); } @Override public DOMStoreWriteTransaction newWriteOnlyTransaction() { actorContext.acquireTxCreationPermit(); - return new TransactionProxy(actorContext, TransactionType.WRITE_ONLY); + return new TransactionProxy(txContextFactory, TransactionType.WRITE_ONLY); } @Override public DOMStoreReadWriteTransaction newReadWriteTransaction() { actorContext.acquireTxCreationPermit(); - return new TransactionProxy(actorContext, TransactionType.READ_WRITE); + return new TransactionProxy(txContextFactory, TransactionType.READ_WRITE); } @Override @@ -170,19 +185,25 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } @Override - public void onDatastoreContextUpdated(DatastoreContext context) { - LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreType()); + public void onDatastoreContextUpdated(DatastoreContextFactory contextFactory) { + LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreName()); - actorContext.setDatastoreContext(context); - datastoreConfigMXBean.setContext(context); + actorContext.setDatastoreContext(contextFactory); + datastoreConfigMXBean.setContext(contextFactory.getBaseDatastoreContext()); } @Override public void close() { - datastoreConfigMXBean.unregisterMBean(); - datastoreInfoMXBean.unregisterMBean(); + LOG.info("Closing data store {}", type); - if(closeable != null) { + if (datastoreConfigMXBean != null) { + datastoreConfigMXBean.unregisterMBean(); + } + if (datastoreInfoMXBean != null) { + datastoreInfoMXBean.unregisterMBean(); + } + + if (closeable != null) { try { closeable.close(); } catch (Exception e) { @@ -190,12 +211,11 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } } + txContextFactory.close(); actorContext.shutdown(); - DistributedDataStoreFactory.destroyInstance(this); } - @VisibleForTesting - ActorContext getActorContext() { + public ActorContext getActorContext() { return actorContext; } @@ -213,15 +233,14 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } } - private ActorRef createShardManager(ActorSystem actorSystem, ClusterWrapper cluster, Configuration configuration, - DatastoreContext datastoreContext, String shardDispatcher, String shardManagerId){ + private static ActorRef createShardManager(ActorSystem actorSystem, ShardManagerCreator creator, + String shardDispatcher, String shardManagerId) { Exception lastException = null; for(int i=0;i<100;i++) { try { - return actorSystem.actorOf( - ShardManager.props(cluster, configuration, datastoreContext, waitTillReadyCountDownLatch) - .withDispatcher(shardDispatcher).withMailbox(ActorContext.MAILBOX), shardManagerId); + return actorSystem.actorOf(creator.props().withDispatcher(shardDispatcher).withMailbox( + ActorContext.BOUNDED_MAILBOX), shardManagerId); } catch (Exception e){ lastException = e; Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);