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=0bdb29b598a56e876b2acddfa2ee38186c482125;hp=198c3b2edaa137e6a2b6c5d32d14a1b00798106b;hb=c796596b5c46b5203c30b143e6282662e66c5642;hpb=d3358dde361ed5bd94466ded15dac0bba45afe9c 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 198c3b2eda..0bdb29b598 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,11 +10,17 @@ 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; @@ -27,12 +33,15 @@ import org.opendaylight.controller.cluster.datastore.utils.PrimaryShardInfoFutur 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; @@ -44,11 +53,10 @@ import org.slf4j.LoggerFactory; /** * */ -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; @@ -63,7 +71,8 @@ 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; @@ -75,9 +84,22 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, Preconditions.checkNotNull(configuration, "configuration should not be null"); Preconditions.checkNotNull(datastoreContextFactory, "datastoreContextFactory should not be null"); - this.type = datastoreContextFactory.getBaseDatastoreContext().getDataStoreName(); + final Props clientProps = DistributedDataStoreClientActor.props(cluster.getCurrentMemberName(), + datastoreContextFactory.getBaseDatastoreContext().getDataStoreName()); + 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); + } - String shardManagerId = ShardManagerIdentifier.builder().type(type).build().toString(); + identifier = client.getIdentifier(); + LOG.debug("Distributed data store client {} started", identifier); + + String shardManagerId = ShardManagerIdentifier.builder() + .type(datastoreContextFactory.getBaseDatastoreContext().getDataStoreName()).build().toString(); LOG.info("Creating ShardManager : {}", shardManagerId); @@ -96,7 +118,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; - this.txContextFactory = TransactionContextFactory.create(actorContext); + this.txContextFactory = new TransactionContextFactory(actorContext, identifier); datastoreConfigMXBean = new DatastoreConfigurationMXBeanImpl( datastoreContextFactory.getBaseDatastoreContext().getDataStoreMXBeanType()); @@ -109,10 +131,11 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } @VisibleForTesting - DistributedDataStore(ActorContext actorContext) { + DistributedDataStore(ActorContext actorContext, ClientIdentifier identifier) { this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null"); - this.txContextFactory = TransactionContextFactory.create(actorContext); - this.type = UNKNOWN_TYPE; + this.client = null; + this.identifier = Preconditions.checkNotNull(identifier); + this.txContextFactory = new TransactionContextFactory(actorContext, identifier); this.waitTillReadyTimeInMillis = actorContext.getDatastoreContext().getShardLeaderElectionTimeout().duration().toMillis() * READY_WAIT_FACTOR; } @@ -157,6 +180,23 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, return listenerRegistrationProxy; } + + @Override + public DOMDataTreeCommitCohortRegistration registerCommitCohort( + DOMDataTreeIdentifier subtree, 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(); @@ -194,7 +234,7 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, @Override public void close() { - LOG.info("Closing data store {}", type); + LOG.info("Closing data store {}", identifier); if (datastoreConfigMXBean != null) { datastoreConfigMXBean.unregisterMBean(); @@ -213,18 +253,23 @@ 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); + 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)); } @@ -244,7 +289,8 @@ public class DistributedDataStore implements DOMStore, SchemaContextListener, } 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); } }