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=cb6d44dd9264db8a0c1198cee2b2406adbde5f46;hp=5e8b1913c4cf8550a161a9dd6afd079d5c905e56;hb=925cb4a228d0fda99c7bfeb432eb25285a223887;hpb=72a72ae745544e41603f851bf4f47087cfe521ba 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 5e8b1913c4..cb6d44dd92 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 @@ -10,28 +10,38 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorRef; import akka.actor.ActorSystem; +import akka.actor.PoisonPill; +import akka.actor.Props; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; import com.google.common.util.concurrent.Uninterruptibles; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; +import org.opendaylight.controller.cluster.databroker.actors.dds.DistributedDataStoreClient; +import org.opendaylight.controller.cluster.databroker.actors.dds.DistributedDataStoreClientActor; 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.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; -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.DOMStoreTreeChangePublisher; import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; +import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -41,13 +51,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * + * Implements a distributed DOMStore. */ -public class DistributedDataStore implements DOMStore, SchemaContextListener, - DatastoreContextConfigAdminOverlay.Listener, DOMStoreTreeChangePublisher, AutoCloseable { +public class DistributedDataStore implements DistributedDataStoreInterface, SchemaContextListener, + DatastoreContextConfigAdminOverlay.Listener, DOMStoreTreeChangePublisher, + DOMDataTreeCommitCohortRegistry, 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; @@ -62,21 +72,22 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, private final CountDownLatch waitTillReadyCountDownLatch = new CountDownLatch(1); - private final String type; + private final ClientIdentifier identifier; + private final DistributedDataStoreClient client; private final TransactionContextFactory txContextFactory; - public DistributedDataStore(ActorSystem actorSystem, ClusterWrapper cluster, - Configuration configuration, DatastoreContextFactory datastoreContextFactory, - DatastoreSnapshot restoreFromSnapshot) { + @SuppressWarnings("checkstyle:IllegalCatch") + public DistributedDataStore(final ActorSystem actorSystem, final ClusterWrapper cluster, + final Configuration configuration, final DatastoreContextFactory datastoreContextFactory, + final 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(datastoreContextFactory, "datastoreContextFactory should not be null"); - this.type = datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(); - - String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); + String shardManagerId = ShardManagerIdentifier.builder() + .type(datastoreContextFactory.getBaseDatastoreContext().getDataStoreName()).build().toString(); LOG.info("Creating ShardManager : {}", shardManagerId); @@ -85,38 +96,56 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, PrimaryShardInfoFutureCache primaryShardInfoCache = new PrimaryShardInfoFutureCache(); - ShardManager.Builder builder = ShardManager.builder().cluster(cluster).configuration(configuration). - datastoreContextFactory(datastoreContextFactory).waitTillReadyCountdownLatch(waitTillReadyCountDownLatch). - primaryShardInfoCache(primaryShardInfoCache).restoreFromSnapshot(restoreFromSnapshot); + 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); - actorContext = new ActorContext(actorSystem, createShardManager(actorSystem, builder, shardDispatcher, - shardManagerId), cluster, configuration, datastoreContextFactory.getBaseDatastoreContext(), primaryShardInfoCache); + final Props clientProps = DistributedDataStoreClientActor.props(cluster.getCurrentMemberName(), + datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(), actorContext); + final ActorRef clientActor = actorSystem.actorOf(clientProps); + try { + client = DistributedDataStoreClientActor.getDistributedDataStoreClient(clientActor, 30, TimeUnit.SECONDS); + } catch (Exception e) { + LOG.error("Failed to get actor for {}", clientProps, e); + clientActor.tell(PoisonPill.getInstance(), ActorRef.noSender()); + throw Throwables.propagate(e); + } - this.waitTillReadyTimeInMillis = - actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; + identifier = client.getIdentifier(); + LOG.debug("Distributed data store client {} started", identifier); - this.txContextFactory = TransactionContextFactory.create(actorContext); + this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout() + .duration().toMillis() * READY_WAIT_FACTOR; + + this.txContextFactory = new TransactionContextFactory(actorContext, identifier); datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl( datastoreContextFactory.getBaseDatastoreContext().getDataStoreMXBeanType()); datastoreConfigMXBean.setContext(datastoreContextFactory.getBaseDatastoreContext()); datastoreConfigMXBean.registerMBean(); - datastoreInfoMXBean = new DatastoreInfoMXBeanImpl(datastoreContextFactory.getBaseDatastoreContext(). - getDataStoreMXBeanType(), actorContext); + datastoreInfoMXBean = new DatastoreInfoMXBeanImpl(datastoreContextFactory.getBaseDatastoreContext() + .getDataStoreMXBeanType(), actorContext); datastoreInfoMXBean.registerMBean(); } @VisibleForTesting - DistributedDataStore(ActorContext actorContext) { + DistributedDataStore(final ActorContext actorContext, final ClientIdentifier identifier) { 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; + this.client = null; + this.identifier = Preconditions.checkNotNull(identifier); + this.txContextFactory = new TransactionContextFactory(actorContext, identifier); + this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout() + .duration().toMillis() * READY_WAIT_FACTOR; } - public void setCloseable(AutoCloseable closeable) { + public void setCloseable(final AutoCloseable closeable) { this.closeable = closeable; } @@ -124,8 +153,8 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, @Override public >> ListenerRegistration registerChangeListener( - final YangInstanceIdentifier path, L listener, - AsyncDataBroker.DataChangeScope scope) { + final YangInstanceIdentifier path, final L listener, + final AsyncDataBroker.DataChangeScope scope) { Preconditions.checkNotNull(path, "path should not be null"); Preconditions.checkNotNull(listener, "listener should not be null"); @@ -142,7 +171,8 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } @Override - public ListenerRegistration registerTreeChangeListener(YangInstanceIdentifier treeId, L listener) { + public ListenerRegistration registerTreeChangeListener( + final YangInstanceIdentifier treeId, final L listener) { Preconditions.checkNotNull(treeId, "treeId should not be null"); Preconditions.checkNotNull(listener, "listener should not be null"); @@ -150,12 +180,30 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, LOG.debug("Registering tree listener: {} for tree: {} shard: {}", listener, treeId, shardName); final DataTreeChangeListenerProxy listenerRegistrationProxy = - new DataTreeChangeListenerProxy(actorContext, listener); + new DataTreeChangeListenerProxy<>(actorContext, listener); listenerRegistrationProxy.init(shardName, treeId); return listenerRegistrationProxy; } + + @Override + public DOMDataTreeCommitCohortRegistration registerCommitCohort( + final DOMDataTreeIdentifier subtree, final C cohort) { + YangInstanceIdentifier treeId = + Preconditions.checkNotNull(subtree, "subtree should not be null").getRootIdentifier(); + Preconditions.checkNotNull(cohort, "listener should not be null"); + + + final String shardName = actorContext.getShardStrategyFactory().getStrategy(treeId).findShard(treeId); + LOG.debug("Registering cohort: {} for tree: {} shard: {}", cohort, treeId, shardName); + + DataTreeCohortRegistrationProxy cohortProxy = + new DataTreeCohortRegistrationProxy<>(actorContext, subtree, cohort); + cohortProxy.init(shardName); + return cohortProxy; + } + @Override public DOMStoreTransactionChain createTransactionChain() { return txContextFactory.createTransactionChain(); @@ -163,7 +211,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, @Override public DOMStoreReadTransaction newReadOnlyTransaction() { - return new TransactionProxy(txContextFactory, TransactionType.READ_ONLY); + return new TransactionProxy(txContextFactory, TransactionType.READ_ONLY); } @Override @@ -179,21 +227,22 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } @Override - public void onGlobalContextUpdated(SchemaContext schemaContext) { + public void onGlobalContextUpdated(final SchemaContext schemaContext) { actorContext.setSchemaContext(schemaContext); } @Override - public void onDatastoreContextUpdated(DatastoreContextFactory contextFactory) { - LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreType()); + public void onDatastoreContextUpdated(final DatastoreContextFactory contextFactory) { + LOG.info("DatastoreContext updated for data store {}", actorContext.getDataStoreName()); actorContext.setDatastoreContext(contextFactory); datastoreConfigMXBean.setContext(contextFactory.getBaseDatastoreContext()); } @Override + @SuppressWarnings("checkstyle:IllegalCatch") public void close() { - LOG.info("Closing data store {}", type); + LOG.info("Closing data store {}", identifier); if (datastoreConfigMXBean != null) { datastoreConfigMXBean.unregisterMBean(); @@ -212,38 +261,46 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, txContextFactory.close(); actorContext.shutdown(); + + if (client != null) { + client.close(); + } } + @Override public ActorContext getActorContext() { return actorContext; } - public void waitTillReady(){ - LOG.info("Beginning to wait for data store to become ready : {}", type); + public void waitTillReady() { + LOG.info("Beginning to wait for data store to become ready : {}", identifier); try { if (waitTillReadyCountDownLatch.await(waitTillReadyTimeInMillis, TimeUnit.MILLISECONDS)) { - LOG.debug("Data store {} is now ready", type); + LOG.debug("Data store {} is now ready", identifier); } else { - LOG.error("Shared leaders failed to settle in {} seconds, giving up", TimeUnit.MILLISECONDS.toSeconds(waitTillReadyTimeInMillis)); + LOG.error("Shard leaders failed to settle in {} seconds, giving up", + TimeUnit.MILLISECONDS.toSeconds(waitTillReadyTimeInMillis)); } } catch (InterruptedException e) { LOG.error("Interrupted while waiting for shards to settle", e); } } - private ActorRef createShardManager(ActorSystem actorSystem, ShardManager.Builder builder, String shardDispatcher, - String shardManagerId){ + @SuppressWarnings("checkstyle:IllegalCatch") + private static ActorRef createShardManager(final ActorSystem actorSystem, final ShardManagerCreator creator, + final String shardDispatcher, final String shardManagerId) { Exception lastException = null; - for(int i=0;i<100;i++) { + for (int i = 0; i < 100; i++) { try { - return actorSystem.actorOf(builder.props().withDispatcher(shardDispatcher).withMailbox( - ActorContext.MAILBOX), shardManagerId); - } catch (Exception e){ + return actorSystem.actorOf(creator.props().withDispatcher(shardDispatcher).withMailbox( + ActorContext.BOUNDED_MAILBOX), shardManagerId); + } catch (Exception e) { lastException = e; Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS); - LOG.debug(String.format("Could not create actor %s because of %s - waiting for sometime before retrying (retry count = %d)", shardManagerId, e.getMessage(), i)); + LOG.debug("Could not create actor {} because of {} - waiting for sometime before retrying " + + "(retry count = {})", shardManagerId, e.getMessage(), i); } }