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=87da2b04425a28ae4be300e5ec9a2595b7987185;hp=b0eaf98d59c9ccd2d1eda1f6d782736db238290e;hb=7df9909614131c0870267732277d7aa78501afdc;hpb=139937c2e646894af6a9b2b8a8a1047c6ef82485 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 b0eaf98d59..87da2b0442 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 @@ -13,6 +13,8 @@ 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; @@ -23,14 +25,13 @@ 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; import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * @author: syedbahm @@ -38,12 +39,12 @@ 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); + ShardStats shardStats, String transactionID, short clientTxVersion) { + super(shardActor, shardStats, transactionID, clientTxVersion); this.transaction = transaction; } @@ -55,50 +56,53 @@ public class ShardWriteTransaction extends ShardTransaction { @Override public void handleReceive(Object message) throws Exception { - if (message instanceof WriteData) { - writeData(transaction, (WriteData) message, !SERIALIZED_REPLY); - - } else if (message instanceof MergeData) { - mergeData(transaction, (MergeData) message, !SERIALIZED_REPLY); - - } else if (message instanceof DeleteData) { - deleteData(transaction, (DeleteData) message, !SERIALIZED_REPLY); - + if (message instanceof BatchedModifications) { + batchedModifications((BatchedModifications)message); } else if (message instanceof ReadyTransaction) { - readyTransaction(transaction, new ReadyTransaction(), !SERIALIZED_REPLY); - - } else if(WriteData.SERIALIZABLE_CLASS.equals(message.getClass())) { - writeData(transaction, WriteData.fromSerializable(message, getSchemaContext()), SERIALIZED_REPLY); + readyTransaction(transaction, !SERIALIZED_REPLY); + } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { + readyTransaction(transaction, SERIALIZED_REPLY); + } else if(WriteData.isSerializedType(message)) { + writeData(transaction, WriteData.fromSerializable(message), SERIALIZED_REPLY); - } else if(MergeData.SERIALIZABLE_CLASS.equals(message.getClass())) { - mergeData(transaction, MergeData.fromSerializable(message, getSchemaContext()), SERIALIZED_REPLY); + } else if(MergeData.isSerializedType(message)) { + mergeData(transaction, MergeData.fromSerializable(message), SERIALIZED_REPLY); - } else if(DeleteData.SERIALIZABLE_CLASS.equals(message.getClass())) { + } else if(DeleteData.isSerializedType(message)) { deleteData(transaction, DeleteData.fromSerializable(message), SERIALIZED_REPLY); - } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { - readyTransaction(transaction, new ReadyTransaction(), 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 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()); - modification.addModification( - new WriteModification(message.getPath(), message.getData(), getSchemaContext())); + compositeModification.addModification( + new WriteModification(message.getPath(), message.getData())); try { transaction.write(message.getPath(), message.getData()); - WriteDataReply writeDataReply = new WriteDataReply(); - getSender().tell(returnSerialized ? writeDataReply.toSerializable() : writeDataReply, - 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()); } @@ -108,14 +112,14 @@ public class ShardWriteTransaction extends ShardTransaction { boolean returnSerialized) { LOG.debug("mergeData at path : {}", message.getPath()); - modification.addModification( - new MergeModification(message.getPath(), message.getData(), getSchemaContext())); + compositeModification.addModification( + new MergeModification(message.getPath(), message.getData())); try { transaction.merge(message.getPath(), message.getData()); - MergeDataReply mergeDataReply = new MergeDataReply(); - getSender().tell(returnSerialized ? mergeDataReply.toSerializable() : mergeDataReply , - 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()); } @@ -125,27 +129,26 @@ public class ShardWriteTransaction extends ShardTransaction { boolean returnSerialized) { LOG.debug("deleteData at path : {}", message.getPath()); - modification.addModification(new DeleteModification(message.getPath())); + compositeModification.addModification(new DeleteModification(message.getPath())); try { transaction.delete(message.getPath()); - DeleteDataReply deleteDataReply = new DeleteDataReply(); - getSender().tell(returnSerialized ? deleteDataReply.toSerializable() : deleteDataReply, - 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, - boolean returnSerialized) { + private void readyTransaction(DOMStoreWriteTransaction transaction, boolean returnSerialized) { String transactionID = getTransactionID(); LOG.debug("readyTransaction : {}", transactionID); DOMStoreThreePhaseCommitCohort cohort = transaction.ready(); - getShardActor().forward(new ForwardedReadyTransaction(transactionID, cohort, modification, - returnSerialized), 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());