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%2FShard.java;h=c329a10c0408072677bb39d9994c5ce158c74cb0;hb=eed379a371f49c487aab762c55443fad18613417;hp=21fea96320f30754baa2c300877c768c895b4d02;hpb=62ee81f764eef592f00e67181b4dbedb3f734de6;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 21fea96320..c329a10c04 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -16,7 +16,10 @@ import akka.event.LoggingAdapter; import akka.japi.Creator; import akka.serialization.Serialization; import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; +import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; +import org.opendaylight.controller.cluster.datastore.identifiers.ShardTransactionIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardMBeanFactory; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply; @@ -38,6 +41,7 @@ import org.opendaylight.controller.cluster.raft.RaftActor; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; +import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; @@ -67,6 +71,7 @@ public class Shard extends RaftActor { public static final String DEFAULT_NAME = "default"; + // The state of this Shard private final InMemoryDOMDataStore store; private final Map @@ -76,10 +81,11 @@ public class Shard extends RaftActor { Logging.getLogger(getContext().system(), this); // By default persistent will be true and can be turned off using the system - // property persistent + // property shard.persistent private final boolean persistent; - private final String name; + /// The name of this shard + private final ShardIdentifier name; private volatile SchemaContext schemaContext; @@ -87,8 +93,9 @@ public class Shard extends RaftActor { private final List dataChangeListeners = new ArrayList<>(); - private Shard(String name, Map peerAddresses) { - super(name, peerAddresses, Optional.of(configParams)); + private Shard(ShardIdentifier name, Map peerAddresses, + InMemoryDOMDataStoreConfigProperties dataStoreProperties) { + super(name.toString(), mapPeerAddresses(peerAddresses), Optional.of(configParams)); this.name = name; @@ -96,21 +103,35 @@ public class Shard extends RaftActor { this.persistent = !"false".equals(setting); - LOG.info("Creating shard : {} persistent : {}", name, persistent); + LOG.info("Shard created : {} persistent : {}", name, persistent); - store = InMemoryDOMDataStoreFactory.create(name, null); + store = InMemoryDOMDataStoreFactory.create(name.toString(), null, dataStoreProperties); - shardMBean = ShardMBeanFactory.getShardStatsMBean(name); + shardMBean = ShardMBeanFactory.getShardStatsMBean(name.toString()); } - public static Props props(final String name, - final Map peerAddresses) { + private static Map mapPeerAddresses(Map peerAddresses){ + Map map = new HashMap<>(); + + for(Map.Entry entry : peerAddresses.entrySet()){ + map.put(entry.getKey().toString(), entry.getValue()); + } + + return map; + } + + public static Props props(final ShardIdentifier name, + final Map peerAddresses, + final InMemoryDOMDataStoreConfigProperties dataStoreProperties) { + Preconditions.checkNotNull(name, "name should not be null"); + Preconditions.checkNotNull(peerAddresses, "peerAddresses should not be null"); + return Props.create(new Creator() { @Override public Shard create() throws Exception { - return new Shard(name, peerAddresses); + return new Shard(name, peerAddresses, dataStoreProperties); } }); @@ -143,39 +164,46 @@ public class Shard extends RaftActor { } } else if (message instanceof PeerAddressResolved) { PeerAddressResolved resolved = (PeerAddressResolved) message; - setPeerAddress(resolved.getPeerId(), resolved.getPeerAddress()); - } else{ + setPeerAddress(resolved.getPeerId().toString(), resolved.getPeerAddress()); + } else { super.onReceiveCommand(message); } } private ActorRef createTypedTransactionActor( - CreateTransaction createTransaction, String transactionId) { + CreateTransaction createTransaction, ShardTransactionIdentifier transactionId) { if (createTransaction.getTransactionType() == TransactionProxy.TransactionType.READ_ONLY.ordinal()) { + shardMBean.incrementReadOnlyTransactionCount(); + return getContext().actorOf( ShardTransaction .props(store.newReadOnlyTransaction(), getSelf(), - schemaContext), transactionId); + schemaContext), transactionId.toString()); } else if (createTransaction.getTransactionType() == TransactionProxy.TransactionType.READ_WRITE.ordinal()) { + shardMBean.incrementReadWriteTransactionCount(); + return getContext().actorOf( ShardTransaction .props(store.newReadWriteTransaction(), getSelf(), - schemaContext), transactionId); + schemaContext), transactionId.toString()); } else if (createTransaction.getTransactionType() == TransactionProxy.TransactionType.WRITE_ONLY.ordinal()) { + shardMBean.incrementWriteOnlyTransactionCount(); + return getContext().actorOf( ShardTransaction .props(store.newWriteOnlyTransaction(), getSelf(), - schemaContext), transactionId); + schemaContext), transactionId.toString()); } else { + // FIXME: This does not seem right throw new IllegalArgumentException( "CreateTransaction message has unidentified transaction type=" + createTransaction.getTransactionType()); @@ -184,8 +212,8 @@ public class Shard extends RaftActor { private void createTransaction(CreateTransaction createTransaction) { - String transactionId = "shard-" + createTransaction.getTransactionId(); - LOG.info("Creating transaction : {} ", transactionId); + ShardTransactionIdentifier transactionId = ShardTransactionIdentifier.builder().remoteTransactionId(createTransaction.getTransactionId()).build(); + LOG.debug("Creating transaction : {} ", transactionId); ActorRef transactionActor = createTypedTransactionActor(createTransaction, transactionId); @@ -202,9 +230,9 @@ public class Shard extends RaftActor { DOMStoreThreePhaseCommitCohort cohort = modificationToCohort.remove(serialized); if (cohort == null) { - LOG.error( - "Could not find cohort for modification : {}", modification); - LOG.info("Writing modification using a new transaction"); + LOG.debug( + "Could not find cohort for modification : {}. Writing modification using a new transaction", + modification); DOMStoreReadWriteTransaction transaction = store.newReadWriteTransaction(); modification.apply(transaction); @@ -237,7 +265,6 @@ public class Shard extends RaftActor { self); shardMBean.incrementCommittedTransactionCount(); shardMBean.setLastCommittedTransactionTime(new Date()); - } catch (InterruptedException | ExecutionException e) { shardMBean.incrementFailedTransactionsCount(); sender.tell(new akka.actor.Status.Failure(e),self); @@ -269,7 +296,7 @@ public class Shard extends RaftActor { private void registerChangeListener( RegisterChangeListener registerChangeListener) { - LOG.debug("registerDataChangeListener for " + registerChangeListener + LOG.debug("registerDataChangeListener for {}", registerChangeListener .getPath()); @@ -301,8 +328,8 @@ public class Shard extends RaftActor { DataChangeListenerRegistration.props(registration)); LOG.debug( - "registerDataChangeListener sending reply, listenerRegistrationPath = " - + listenerRegistration.path().toString()); + "registerDataChangeListener sending reply, listenerRegistrationPath = {} " + , listenerRegistration.path().toString()); getSender() .tell(new RegisterChangeListenerReply(listenerRegistration.path()), @@ -330,7 +357,9 @@ public class Shard extends RaftActor { if (modification != null) { commit(clientActor, modification); } else { - LOG.error("modification is null - this is very unexpected"); + LOG.error( + "modification is null - this is very unexpected, clientActor = {}, identifier = {}", + identifier, clientActor.path().toString()); } @@ -338,6 +367,7 @@ public class Shard extends RaftActor { LOG.error("Unknown state received {}", data); } + // Update stats ReplicatedLogEntry lastLogEntry = getLastLogEntry(); if(lastLogEntry != null){ @@ -373,7 +403,7 @@ public class Shard extends RaftActor { } @Override public String persistenceId() { - return this.name; + return this.name.toString(); }