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%2FShardWriteTransaction.java;h=d5dcfde803a16bfcc6ea285473167d9b78e8c5cb;hp=e993e4b55ccd8c18cd427f0a45068002c1efc54d;hb=6405fa8d6b47e406cdf566b26b15f980d802cad4;hpb=0eba94d9411ea40945ddc8c732640c0cc004599f diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java index e993e4b55c..d5dcfde803 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardWriteTransaction.java @@ -11,7 +11,10 @@ package org.opendaylight.controller.cluster.datastore; import akka.actor.ActorRef; +import akka.actor.PoisonPill; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; +import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications; +import org.opendaylight.controller.cluster.datastore.messages.BatchedModificationsReply; import org.opendaylight.controller.cluster.datastore.messages.DeleteData; import org.opendaylight.controller.cluster.datastore.messages.DeleteDataReply; import org.opendaylight.controller.cluster.datastore.messages.ForwardedReadyTransaction; @@ -22,8 +25,8 @@ import org.opendaylight.controller.cluster.datastore.messages.WriteData; import org.opendaylight.controller.cluster.datastore.messages.WriteDataReply; import org.opendaylight.controller.cluster.datastore.modification.CompositeModification; import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; -import org.opendaylight.controller.cluster.datastore.modification.ImmutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.MergeModification; +import org.opendaylight.controller.cluster.datastore.modification.Modification; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; @@ -37,12 +40,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public class ShardWriteTransaction extends ShardTransaction { - private final MutableCompositeModification modification = new MutableCompositeModification(); + private final MutableCompositeModification compositeModification = new MutableCompositeModification(); private final DOMStoreWriteTransaction transaction; public ShardWriteTransaction(DOMStoreWriteTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext, ShardStats shardStats, String transactionID) { - super(shardActor, schemaContext, shardStats, transactionID); + SchemaContext schemaContext, ShardStats shardStats, String transactionID, + short clientTxVersion) { + super(shardActor, schemaContext, shardStats, transactionID, clientTxVersion); this.transaction = transaction; } @@ -53,69 +57,103 @@ public class ShardWriteTransaction extends ShardTransaction { @Override public void handleReceive(Object message) throws Exception { - if(WriteData.SERIALIZABLE_CLASS.equals(message.getClass())) { - writeData(transaction, WriteData.fromSerializable(message, getSchemaContext())); - } else if(MergeData.SERIALIZABLE_CLASS.equals(message.getClass())) { - mergeData(transaction, MergeData.fromSerializable(message, getSchemaContext())); - } else if(DeleteData.SERIALIZABLE_CLASS.equals(message.getClass())) { - deleteData(transaction, DeleteData.fromSerializable(message)); + + if (message instanceof BatchedModifications) { + batchedModifications((BatchedModifications)message); + } else if (message instanceof ReadyTransaction) { + readyTransaction(transaction, !SERIALIZED_REPLY); } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { - readyTransaction(transaction, new ReadyTransaction()); + readyTransaction(transaction, SERIALIZED_REPLY); + } else if(WriteData.isSerializedType(message)) { + writeData(transaction, WriteData.fromSerializable(message), SERIALIZED_REPLY); + + } else if(MergeData.isSerializedType(message)) { + mergeData(transaction, MergeData.fromSerializable(message), SERIALIZED_REPLY); + + } else if(DeleteData.isSerializedType(message)) { + deleteData(transaction, DeleteData.fromSerializable(message), SERIALIZED_REPLY); + } else if (message instanceof GetCompositedModification) { // This is here for testing only - getSender().tell(new GetCompositeModificationReply( - new ImmutableCompositeModification(modification)), getSelf()); + getSender().tell(new GetCompositeModificationReply(compositeModification), getSelf()); } else { super.handleReceive(message); } } - private void writeData(DOMStoreWriteTransaction transaction, WriteData message) { - modification.addModification( - new WriteModification(message.getPath(), message.getData(), getSchemaContext())); - if(LOG.isDebugEnabled()) { - LOG.debug("writeData at path : " + message.getPath().toString()); + private void batchedModifications(BatchedModifications batched) { + try { + for(Modification modification: batched.getModifications()) { + compositeModification.addModification(modification); + modification.apply(transaction); + } + + getSender().tell(new BatchedModificationsReply(batched.getModifications().size()), getSelf()); + } catch (Exception e) { + getSender().tell(new akka.actor.Status.Failure(e), getSelf()); } + } + + private void writeData(DOMStoreWriteTransaction transaction, WriteData message, + boolean returnSerialized) { + LOG.debug("writeData at path : {}", message.getPath()); + + compositeModification.addModification( + new WriteModification(message.getPath(), message.getData())); try { transaction.write(message.getPath(), message.getData()); - getSender().tell(new WriteDataReply().toSerializable(), getSelf()); + WriteDataReply writeDataReply = WriteDataReply.INSTANCE; + getSender().tell(returnSerialized ? writeDataReply.toSerializable(message.getVersion()) : + writeDataReply, getSelf()); }catch(Exception e){ getSender().tell(new akka.actor.Status.Failure(e), getSelf()); } } - private void mergeData(DOMStoreWriteTransaction transaction, MergeData message) { - modification.addModification( - new MergeModification(message.getPath(), message.getData(), getSchemaContext())); - if(LOG.isDebugEnabled()) { - LOG.debug("mergeData at path : " + message.getPath().toString()); - } + private void mergeData(DOMStoreWriteTransaction transaction, MergeData message, + boolean returnSerialized) { + LOG.debug("mergeData at path : {}", message.getPath()); + + compositeModification.addModification( + new MergeModification(message.getPath(), message.getData())); + try { transaction.merge(message.getPath(), message.getData()); - getSender().tell(new MergeDataReply().toSerializable(), getSelf()); + MergeDataReply mergeDataReply = MergeDataReply.INSTANCE; + getSender().tell(returnSerialized ? mergeDataReply.toSerializable(message.getVersion()) : + mergeDataReply, getSelf()); }catch(Exception e){ getSender().tell(new akka.actor.Status.Failure(e), getSelf()); } } - private void deleteData(DOMStoreWriteTransaction transaction, DeleteData message) { - if(LOG.isDebugEnabled()) { - LOG.debug("deleteData at path : " + message.getPath().toString()); - } - modification.addModification(new DeleteModification(message.getPath())); + private void deleteData(DOMStoreWriteTransaction transaction, DeleteData message, + boolean returnSerialized) { + LOG.debug("deleteData at path : {}", message.getPath()); + + compositeModification.addModification(new DeleteModification(message.getPath())); try { transaction.delete(message.getPath()); - getSender().tell(new DeleteDataReply().toSerializable(), getSelf()); + DeleteDataReply deleteDataReply = DeleteDataReply.INSTANCE; + getSender().tell(returnSerialized ? deleteDataReply.toSerializable(message.getVersion()) : + deleteDataReply, getSelf()); }catch(Exception e){ getSender().tell(new akka.actor.Status.Failure(e), getSelf()); } } - private void readyTransaction(DOMStoreWriteTransaction transaction, ReadyTransaction message) { + private void readyTransaction(DOMStoreWriteTransaction transaction, boolean returnSerialized) { + String transactionID = getTransactionID(); + + LOG.debug("readyTransaction : {}", transactionID); + DOMStoreThreePhaseCommitCohort cohort = transaction.ready(); - getShardActor().forward(new ForwardedReadyTransaction(getTransactionID(), cohort, modification), - getContext()); + getShardActor().forward(new ForwardedReadyTransaction(transactionID, getClientTxVersion(), + cohort, compositeModification, returnSerialized), getContext()); + + // The shard will handle the commit from here so we're no longer needed - self-destruct. + getSelf().tell(PoisonPill.getInstance(), getSelf()); } // These classes are in here for test purposes only