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%2FShard.java;h=63b26331a510835ae623a9feade7893938d81f84;hp=999d0f8bafca9639baa70ea7c893656f87704ae7;hb=886fe1a50077d9dc9c4c36f938fc7c86317cb149;hpb=df13d272f2f74892f2decd54ece5d8286fb1c995 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 999d0f8baf..63b26331a5 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 @@ -15,9 +15,11 @@ import akka.event.Logging; 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 com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; +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; @@ -25,6 +27,7 @@ import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction; import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionChain; import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionChainReply; import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply; +import org.opendaylight.controller.cluster.datastore.messages.EnableNotification; import org.opendaylight.controller.cluster.datastore.messages.ForwardedCommitTransaction; import org.opendaylight.controller.cluster.datastore.messages.PeerAddressResolved; import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListener; @@ -32,20 +35,28 @@ import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeList import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext; import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; +import org.opendaylight.controller.cluster.raft.ConfigParams; +import org.opendaylight.controller.cluster.raft.DefaultConfigParamsImpl; 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.InMemoryDOMDataStoreFactory; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; 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 scala.concurrent.duration.FiniteDuration; +import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; /** * A Shard represents a portion of the logical data tree
@@ -55,11 +66,11 @@ import java.util.concurrent.Executors; */ public class Shard extends RaftActor { - public static final String DEFAULT_NAME = "default"; + private static final ConfigParams configParams = new ShardConfigParams(); - private final ListeningExecutorService storeExecutor = - MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(2)); + public static final String DEFAULT_NAME = "default"; + // The state of this Shard private final InMemoryDOMDataStore store; private final Map @@ -69,17 +80,20 @@ 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 SchemaContext schemaContext; + private volatile SchemaContext schemaContext; private final ShardStats shardMBean; - private Shard(String name, Map peerAddresses) { - super(name, peerAddresses); + private final List dataChangeListeners = new ArrayList<>(); + + private Shard(ShardIdentifier name, Map peerAddresses) { + super(name.toString(), mapPeerAddresses(peerAddresses), Optional.of(configParams)); this.name = name; @@ -87,15 +101,32 @@ 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 = new InMemoryDOMDataStore(name, storeExecutor); + store = InMemoryDOMDataStoreFactory.create(name.toString(), null); - 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) { + Preconditions.checkNotNull(name, "name should not be null"); + Preconditions.checkNotNull(peerAddresses, "peerAddresses should not be null"); + return Props.create(new Creator() { @Override @@ -107,92 +138,151 @@ public class Shard extends RaftActor { } - @Override public void onReceiveCommand(Object message){ - LOG.debug("Received message {} from {}", message.getClass().toString(), getSender()); + @Override public void onReceiveCommand(Object message) { + LOG.debug("Received message {} from {}", message.getClass().toString(), + getSender()); - if (message.getClass().equals(CreateTransactionChain.SERIALIZABLE_CLASS)) { - if(isLeader()) { + if (message.getClass() + .equals(CreateTransactionChain.SERIALIZABLE_CLASS)) { + if (isLeader()) { createTransactionChain(); - } else if(getLeader() != null){ + } else if (getLeader() != null) { getLeader().forward(message, getContext()); } - } else if (message.getClass().equals(RegisterChangeListener.SERIALIZABLE_CLASS)) { - registerChangeListener(RegisterChangeListener.fromSerializable(getContext().system(), message)); + } else if (message instanceof RegisterChangeListener) { + registerChangeListener((RegisterChangeListener) message); } else if (message instanceof UpdateSchemaContext) { updateSchemaContext((UpdateSchemaContext) message); } else if (message instanceof ForwardedCommitTransaction) { handleForwardedCommit((ForwardedCommitTransaction) message); - } else if (message.getClass().equals(CreateTransaction.SERIALIZABLE_CLASS)) { - if(isLeader()) { + } else if (message.getClass() + .equals(CreateTransaction.SERIALIZABLE_CLASS)) { + if (isLeader()) { createTransaction(CreateTransaction.fromSerializable(message)); - } else if(getLeader() != null){ + } else if (getLeader() != null) { getLeader().forward(message, getContext()); } - } else if (message instanceof PeerAddressResolved){ + } else if (message instanceof PeerAddressResolved) { PeerAddressResolved resolved = (PeerAddressResolved) message; - setPeerAddress(resolved.getPeerId(), resolved.getPeerAddress()); + setPeerAddress(resolved.getPeerId().toString(), resolved.getPeerAddress()); + } else { + super.onReceiveCommand(message); + } + } + + private ActorRef createTypedTransactionActor( + CreateTransaction createTransaction, ShardTransactionIdentifier transactionId) { + if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.READ_ONLY.ordinal()) { + + shardMBean.incrementReadOnlyTransactionCount(); + + return getContext().actorOf( + ShardTransaction + .props(store.newReadOnlyTransaction(), getSelf(), + schemaContext), transactionId.toString()); + + } else if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.READ_WRITE.ordinal()) { + + shardMBean.incrementReadWriteTransactionCount(); + + return getContext().actorOf( + ShardTransaction + .props(store.newReadWriteTransaction(), getSelf(), + schemaContext), transactionId.toString()); + + + } else if (createTransaction.getTransactionType() + == TransactionProxy.TransactionType.WRITE_ONLY.ordinal()) { + + shardMBean.incrementWriteOnlyTransactionCount(); + + return getContext().actorOf( + ShardTransaction + .props(store.newWriteOnlyTransaction(), getSelf(), + schemaContext), transactionId.toString()); } else { - super.onReceiveCommand(message); + // FIXME: This does not seem right + throw new IllegalArgumentException( + "CreateTransaction message has unidentified transaction type=" + + createTransaction.getTransactionType()); } } private void createTransaction(CreateTransaction createTransaction) { - DOMStoreReadWriteTransaction transaction = - store.newReadWriteTransaction(); - String transactionId = "shard-" + createTransaction.getTransactionId(); - LOG.info("Creating transaction : {} " , transactionId); - ActorRef transactionActor = getContext().actorOf( - ShardTransaction.props(transaction, getSelf(), schemaContext), transactionId); + + ShardTransactionIdentifier transactionId = ShardTransactionIdentifier.builder().remoteTransactionId(createTransaction.getTransactionId()).build(); + LOG.debug("Creating transaction : {} ", transactionId); + ActorRef transactionActor = + createTypedTransactionActor(createTransaction, transactionId); getSender() - .tell(new CreateTransactionReply(Serialization.serializedActorPath(transactionActor), createTransaction.getTransactionId()).toSerializable(), + .tell(new CreateTransactionReply( + Serialization.serializedActorPath(transactionActor), + createTransaction.getTransactionId()).toSerializable(), getSelf()); } private void commit(final ActorRef sender, Object serialized) { - Modification modification = MutableCompositeModification.fromSerializable(serialized, schemaContext); + Modification modification = MutableCompositeModification + .fromSerializable(serialized, schemaContext); 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"); - modification.apply(store.newReadWriteTransaction()); + LOG.debug( + "Could not find cohort for modification : {}. Writing modification using a new transaction", + modification); + DOMStoreReadWriteTransaction transaction = + store.newReadWriteTransaction(); + modification.apply(transaction); + DOMStoreThreePhaseCommitCohort commitCohort = transaction.ready(); + ListenableFuture future = + commitCohort.preCommit(); + try { + future.get(); + future = commitCohort.commit(); + future.get(); + } catch (InterruptedException | ExecutionException e) { + shardMBean.incrementFailedTransactionsCount(); + LOG.error("Failed to commit", e); + return; + } + //we want to just apply the recovery commit and return + shardMBean.incrementCommittedTransactionCount(); return; } final ListenableFuture future = cohort.commit(); - shardMBean.incrementCommittedTransactionCount(); final ActorRef self = getSelf(); future.addListener(new Runnable() { @Override public void run() { try { future.get(); - - if(sender != null) { sender .tell(new CommitTransactionReply().toSerializable(), self); - } else { - LOG.error("sender is null ???"); - } + shardMBean.incrementCommittedTransactionCount(); + shardMBean.setLastCommittedTransactionTime(new Date()); } catch (InterruptedException | ExecutionException e) { - // FIXME : Handle this properly - LOG.error(e, "An exception happened when committing"); + shardMBean.incrementFailedTransactionsCount(); + sender.tell(new akka.actor.Status.Failure(e),self); } } }, getContext().dispatcher()); } private void handleForwardedCommit(ForwardedCommitTransaction message) { - Object serializedModification = message.getModification().toSerializable(); + Object serializedModification = + message.getModification().toSerializable(); modificationToCohort - .put(serializedModification , message.getCohort()); + .put(serializedModification, message.getCohort()); - if(persistent) { - this.persistData(getSender(), "identifier", new CompositeModificationPayload(serializedModification)); + if (persistent) { + this.persistData(getSender(), "identifier", + new CompositeModificationPayload(serializedModification)); } else { this.commit(getSender(), serializedModification); } @@ -206,15 +296,28 @@ public class Shard extends RaftActor { private void registerChangeListener( RegisterChangeListener registerChangeListener) { - LOG.debug("registerDataChangeListener for " + registerChangeListener.getPath()); + LOG.debug("registerDataChangeListener for {}", registerChangeListener + .getPath()); ActorSelection dataChangeListenerPath = getContext() .system().actorSelection( registerChangeListener.getDataChangeListenerPath()); + + // Notify the listener if notifications should be enabled or not + // If this shard is the leader then it will enable notifications else + // it will not + dataChangeListenerPath + .tell(new EnableNotification(isLeader()), getSelf()); + + // Now store a reference to the data change listener so it can be notified + // at a later point if notifications should be enabled or disabled + dataChangeListeners.add(dataChangeListenerPath); + AsyncDataChangeListener> - listener = new DataChangeListenerProxy(schemaContext,dataChangeListenerPath); + listener = + new DataChangeListenerProxy(schemaContext, dataChangeListenerPath); org.opendaylight.yangtools.concepts.ListenerRegistration>> registration = @@ -224,10 +327,12 @@ public class Shard extends RaftActor { getContext().actorOf( DataChangeListenerRegistration.props(registration)); - LOG.debug("registerDataChangeListener sending reply, listenerRegistrationPath = " + listenerRegistration.path().toString()); + LOG.debug( + "registerDataChangeListener sending reply, listenerRegistrationPath = {} " + , listenerRegistration.path().toString()); getSender() - .tell(new RegisterChangeListenerReply(listenerRegistration.path()).toSerializable(), + .tell(new RegisterChangeListenerReply(listenerRegistration.path()), getSelf()); } @@ -238,21 +343,41 @@ public class Shard extends RaftActor { ShardTransactionChain.props(chain, schemaContext)); getSender() .tell(new CreateTransactionChainReply(transactionChain.path()) - .toSerializable(), + .toSerializable(), getSelf()); } @Override protected void applyState(ActorRef clientActor, String identifier, Object data) { - if(data instanceof CompositeModificationPayload){ + if (data instanceof CompositeModificationPayload) { Object modification = ((CompositeModificationPayload) data).getModification(); - commit(clientActor, modification); + + if (modification != null) { + commit(clientActor, modification); + } else { + LOG.error( + "modification is null - this is very unexpected, clientActor = {}, identifier = {}", + identifier, clientActor.path().toString()); + } + + } else { LOG.error("Unknown state received {}", data); } + // Update stats + ReplicatedLogEntry lastLogEntry = getLastLogEntry(); + + if(lastLogEntry != null){ + shardMBean.setLastLogIndex(lastLogEntry.getIndex()); + shardMBean.setLastLogTerm(lastLogEntry.getTerm()); + } + + shardMBean.setCommitIndex(getCommitIndex()); + shardMBean.setLastApplied(getLastApplied()); + } @Override protected Object createSnapshot() { @@ -263,7 +388,31 @@ public class Shard extends RaftActor { throw new UnsupportedOperationException("applySnapshot"); } + @Override protected void onStateChanged() { + for (ActorSelection dataChangeListener : dataChangeListeners) { + dataChangeListener + .tell(new EnableNotification(isLeader()), getSelf()); + } + + if (getLeaderId() != null) { + shardMBean.setLeader(getLeaderId()); + } + + shardMBean.setRaftState(getRaftState().name()); + shardMBean.setCurrentTerm(getCurrentTerm()); + } + @Override public String persistenceId() { - return this.name; + return this.name.toString(); + } + + + private static class ShardConfigParams extends DefaultConfigParamsImpl { + public static final FiniteDuration HEART_BEAT_INTERVAL = + new FiniteDuration(500, TimeUnit.MILLISECONDS); + + @Override public FiniteDuration getHeartBeatInterval() { + return HEART_BEAT_INTERVAL; + } } }