X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShard.java;h=d6ad553cf3a237002645811dad1b299c3f2fd309;hb=83140d53722ad77dd804f7b4d761a673110b83b3;hp=3425608d235ddce1555dac19f6bc3e985b65f7f9;hpb=c1362c86eb19e92e6c64d10099a45deb499c6db1;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 3425608d23..d6ad553cf3 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,10 +15,13 @@ import akka.event.Logging; import akka.event.LoggingAdapter; import akka.japi.Creator; import akka.persistence.Persistent; +import akka.persistence.RecoveryCompleted; import akka.persistence.UntypedProcessor; 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.jmx.mbeans.shard.ShardMBeanFactory; +import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction; import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionChain; @@ -30,13 +33,15 @@ import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeList import org.opendaylight.controller.cluster.datastore.messages.RegisterChangeListenerReply; 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.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; 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.InstanceIdentifier; +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 java.util.HashMap; import java.util.Map; @@ -58,24 +63,32 @@ public class Shard extends UntypedProcessor { private final InMemoryDOMDataStore store; - private final Map + private final Map modificationToCohort = new HashMap<>(); - private final LoggingAdapter log = + private final LoggingAdapter LOG = Logging.getLogger(getContext().system(), this); // By default persistent will be true and can be turned off using the system // property persistent private final boolean persistent; + private SchemaContext schemaContext; + + private final ShardStats shardMBean; + private Shard(String name) { String setting = System.getProperty("shard.persistent"); + this.persistent = !"false".equals(setting); - log.info("Creating shard : {} persistent : {}", name , persistent); + LOG.info("Creating shard : {} persistent : {}", name, persistent); store = new InMemoryDOMDataStore(name, storeExecutor); + + shardMBean = ShardMBeanFactory.getShardStatsMBean(name); + } public static Props props(final String name) { @@ -92,22 +105,32 @@ public class Shard extends UntypedProcessor { @Override public void onReceive(Object message) throws Exception { - log.debug("Received message {}", message); + LOG.debug("Received message " + message.getClass().toString()); + + if(!recoveryFinished()){ + // FIXME : Properly handle recovery + return; + } - if (message instanceof CreateTransactionChain) { + if (message.getClass().equals(CreateTransactionChain.SERIALIZABLE_CLASS)) { createTransactionChain(); - } else if (message instanceof RegisterChangeListener) { - registerChangeListener((RegisterChangeListener) message); + } else if (message.getClass().equals(RegisterChangeListener.SERIALIZABLE_CLASS)) { + registerChangeListener(RegisterChangeListener.fromSerializable(getContext().system(), message)); } else if (message instanceof UpdateSchemaContext) { updateSchemaContext((UpdateSchemaContext) message); } else if (message instanceof ForwardedCommitTransaction) { handleForwardedCommit((ForwardedCommitTransaction) message); } else if (message instanceof Persistent) { - commit((Modification) ((Persistent) message).payload()); - } else if (message instanceof CreateTransaction) { - createTransaction((CreateTransaction) message); + commit(((Persistent)message).payload()); + } else if (message.getClass().equals(CreateTransaction.SERIALIZABLE_CLASS)) { + createTransaction(CreateTransaction.fromSerializable(message)); } else if(message instanceof NonPersistent){ - commit((Modification) ((NonPersistent) message).payload()); + commit(((NonPersistent)message).payload()); + }else if (message instanceof RecoveryCompleted) { + //FIXME: PROPERLY HANDLE RECOVERY COMPLETED + + }else { + throw new Exception("Not recognized message found message=" + message); } } @@ -115,21 +138,23 @@ public class Shard extends UntypedProcessor { DOMStoreReadWriteTransaction transaction = store.newReadWriteTransaction(); ActorRef transactionActor = getContext().actorOf( - ShardTransaction.props(transaction, getSelf()), "shard-" + createTransaction.getTransactionId()); + ShardTransaction.props(transaction, getSelf(), schemaContext), "shard-" + createTransaction.getTransactionId()); getSender() - .tell(new CreateTransactionReply(transactionActor.path(), createTransaction.getTransactionId()), + .tell(new CreateTransactionReply(transactionActor.path().toString(), createTransaction.getTransactionId()).toSerializable(), getSelf()); } - private void commit(Modification modification) { + private void commit(Object serialized) { + Modification modification = MutableCompositeModification.fromSerializable(serialized, schemaContext); DOMStoreThreePhaseCommitCohort cohort = - modificationToCohort.remove(modification); + modificationToCohort.remove(serialized); if (cohort == null) { - log.error( + LOG.error( "Could not find cohort for modification : " + modification); return; } final ListenableFuture future = cohort.commit(); + shardMBean.incrementCommittedTransactionCount(); final ActorRef sender = getSender(); final ActorRef self = getSelf(); future.addListener(new Runnable() { @@ -137,58 +162,67 @@ public class Shard extends UntypedProcessor { public void run() { try { future.get(); - sender.tell(new CommitTransactionReply(), self); + sender.tell(new CommitTransactionReply().toSerializable(), self); } catch (InterruptedException | ExecutionException e) { // FIXME : Handle this properly - log.error(e, "An exception happened when committing"); + LOG.error(e, "An exception happened when committing"); } } }, getContext().dispatcher()); } private void handleForwardedCommit(ForwardedCommitTransaction message) { + Object serializedModification = message.getModification().toSerializable(); + modificationToCohort - .put(message.getModification(), message.getCohort()); + .put(serializedModification , message.getCohort()); if(persistent) { - getSelf().forward(Persistent.create(message.getModification()), + getSelf().forward(Persistent.create(serializedModification), getContext()); } else { - getSelf().forward(NonPersistent.create(message.getModification()), + getSelf().forward(NonPersistent.create(serializedModification), getContext()); } } private void updateSchemaContext(UpdateSchemaContext message) { + this.schemaContext = message.getSchemaContext(); store.onGlobalContextUpdated(message.getSchemaContext()); } private void registerChangeListener( RegisterChangeListener registerChangeListener) { + LOG.debug("registerDataChangeListener for " + registerChangeListener.getPath()); + + ActorSelection dataChangeListenerPath = getContext() .system().actorSelection(registerChangeListener.getDataChangeListenerPath()); - AsyncDataChangeListener> - listener = new DataChangeListenerProxy(dataChangeListenerPath); + AsyncDataChangeListener> + listener = new DataChangeListenerProxy(schemaContext,dataChangeListenerPath); - org.opendaylight.yangtools.concepts.ListenerRegistration>> + org.opendaylight.yangtools.concepts.ListenerRegistration>> registration = store.registerChangeListener(registerChangeListener.getPath(), listener, registerChangeListener.getScope()); ActorRef listenerRegistration = getContext().actorOf( DataChangeListenerRegistration.props(registration)); + + LOG.debug("registerDataChangeListener sending reply, listenerRegistrationPath = " + listenerRegistration.path().toString()); + getSender() - .tell(new RegisterChangeListenerReply(listenerRegistration.path()), + .tell(new RegisterChangeListenerReply(listenerRegistration.path()).toSerializable(), getSelf()); } private void createTransactionChain() { DOMStoreTransactionChain chain = store.createTransactionChain(); ActorRef transactionChain = - getContext().actorOf(ShardTransactionChain.props(chain)); + getContext().actorOf(ShardTransactionChain.props(chain, schemaContext)); getSender() - .tell(new CreateTransactionChainReply(transactionChain.path()), + .tell(new CreateTransactionChainReply(transactionChain.path()).toSerializable(), getSelf()); } }