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=365f97dd3f8f7797ceb953f2b9b71606b4ba099b;hp=2e43219523e0d34b5b015b0ef0fc39370dbf89b8;hb=daaef05cbf70e6cbec9af181258faead6d9620a6;hpb=3f153e5fa694fe4147e72e615edbb5c263e5a394 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 2e43219523..365f97dd3f 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 @@ -1,6 +1,6 @@ /* - * * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -13,24 +13,24 @@ 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.DataExists; import org.opendaylight.controller.cluster.datastore.messages.DeleteData; import org.opendaylight.controller.cluster.datastore.messages.DeleteDataReply; import org.opendaylight.controller.cluster.datastore.messages.ForwardedReadyTransaction; import org.opendaylight.controller.cluster.datastore.messages.MergeData; import org.opendaylight.controller.cluster.datastore.messages.MergeDataReply; +import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction; 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,65 +38,115 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public class ShardWriteTransaction extends ShardTransaction { - private final MutableCompositeModification modification = new MutableCompositeModification(); - private final DOMStoreWriteTransaction transaction; + private final MutableCompositeModification compositeModification = new MutableCompositeModification(); + private int totalBatchedModificationsReceived; + private Exception lastBatchedModificationsException; + private final ReadWriteShardDataTreeTransaction transaction; - public ShardWriteTransaction(DOMStoreWriteTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext, ShardStats shardStats, String transactionID, - short clientTxVersion) { - super(shardActor, schemaContext, shardStats, transactionID, clientTxVersion); + public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor, + ShardStats shardStats, String transactionID, short clientTxVersion) { + super(shardActor, shardStats, transactionID, clientTxVersion); this.transaction = transaction; } @Override - protected DOMStoreTransaction getDOMStoreTransaction() { + protected ReadWriteShardDataTreeTransaction getDOMStoreTransaction() { return transaction; } @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, !SERIALIZED_REPLY); - + readyTransaction(!SERIALIZED_REPLY, false); + } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { + readyTransaction(SERIALIZED_REPLY, false); } else if(WriteData.isSerializedType(message)) { - writeData(transaction, WriteData.fromSerializable(message), SERIALIZED_REPLY); + writeData(WriteData.fromSerializable(message), SERIALIZED_REPLY); } else if(MergeData.isSerializedType(message)) { - mergeData(transaction, MergeData.fromSerializable(message), SERIALIZED_REPLY); - - } else if(DeleteData.SERIALIZABLE_CLASS.equals(message.getClass())) { - deleteData(transaction, DeleteData.fromSerializable(message), SERIALIZED_REPLY); + mergeData(MergeData.fromSerializable(message), SERIALIZED_REPLY); - } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { - readyTransaction(transaction, SERIALIZED_REPLY); + } else if(DeleteData.isSerializedType(message)) { + deleteData(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, - boolean returnSerialized) { + private void batchedModifications(BatchedModifications batched) { + if (checkClosed()) { + if (batched.isReady()) { + getSelf().tell(PoisonPill.getInstance(), getSelf()); + } + return; + } + + try { + for(Modification modification: batched.getModifications()) { + compositeModification.addModification(modification); + modification.apply(transaction.getSnapshot()); + } + + totalBatchedModificationsReceived++; + if(batched.isReady()) { + if(lastBatchedModificationsException != null) { + throw lastBatchedModificationsException; + } + + if(totalBatchedModificationsReceived != batched.getTotalMessagesSent()) { + throw new IllegalStateException(String.format( + "The total number of batched messages received %d does not match the number sent %d", + totalBatchedModificationsReceived, batched.getTotalMessagesSent())); + } + + readyTransaction(false, batched.isDoCommitOnReady()); + } else { + getSender().tell(new BatchedModificationsReply(batched.getModifications().size()), getSelf()); + } + } catch (Exception e) { + lastBatchedModificationsException = e; + getSender().tell(new akka.actor.Status.Failure(e), getSelf()); + + if(batched.isReady()) { + getSelf().tell(PoisonPill.getInstance(), getSelf()); + } + } + } + + protected final void dataExists(DataExists message, final boolean returnSerialized) { + super.dataExists(transaction, message, returnSerialized); + } + + protected final void readData(ReadData message, final boolean returnSerialized) { + super.readData(transaction, message, returnSerialized); + } + + private boolean checkClosed() { + if (transaction.isClosed()) { + getSender().tell(new akka.actor.Status.Failure(new IllegalStateException("Transaction is closed, no modifications allowed")), getSelf()); + return true; + } else { + return false; + } + } + + private void writeData(WriteData message, boolean returnSerialized) { LOG.debug("writeData at path : {}", message.getPath()); + if (checkClosed()) { + return; + } - modification.addModification( - new WriteModification(message.getPath(), message.getData(), getSchemaContext())); + compositeModification.addModification( + new WriteModification(message.getPath(), message.getData())); try { - transaction.write(message.getPath(), message.getData()); + transaction.getSnapshot().write(message.getPath(), message.getData()); WriteDataReply writeDataReply = WriteDataReply.INSTANCE; getSender().tell(returnSerialized ? writeDataReply.toSerializable(message.getVersion()) : writeDataReply, getSelf()); @@ -105,15 +155,17 @@ public class ShardWriteTransaction extends ShardTransaction { } } - private void mergeData(DOMStoreWriteTransaction transaction, MergeData message, - boolean returnSerialized) { + private void mergeData(MergeData message, boolean returnSerialized) { LOG.debug("mergeData at path : {}", message.getPath()); + if (checkClosed()) { + return; + } - modification.addModification( - new MergeModification(message.getPath(), message.getData(), getSchemaContext())); + compositeModification.addModification( + new MergeModification(message.getPath(), message.getData())); try { - transaction.merge(message.getPath(), message.getData()); + transaction.getSnapshot().merge(message.getPath(), message.getData()); MergeDataReply mergeDataReply = MergeDataReply.INSTANCE; getSender().tell(returnSerialized ? mergeDataReply.toSerializable(message.getVersion()) : mergeDataReply, getSelf()); @@ -122,30 +174,32 @@ public class ShardWriteTransaction extends ShardTransaction { } } - private void deleteData(DOMStoreWriteTransaction transaction, DeleteData message, - boolean returnSerialized) { + private void deleteData(DeleteData message, boolean returnSerialized) { LOG.debug("deleteData at path : {}", message.getPath()); + if (checkClosed()) { + return; + } - 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()); - }catch(Exception e){ + transaction.getSnapshot().delete(message.getPath()); + 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, boolean returnSerialized) { + private void readyTransaction(boolean returnSerialized, boolean doImmediateCommit) { String transactionID = getTransactionID(); LOG.debug("readyTransaction : {}", transactionID); - DOMStoreThreePhaseCommitCohort cohort = transaction.ready(); + ShardDataTreeCohort cohort = transaction.ready(); getShardActor().forward(new ForwardedReadyTransaction(transactionID, getClientTxVersion(), - cohort, modification, returnSerialized), getContext()); + cohort, compositeModification, returnSerialized, doImmediateCommit), getContext()); // The shard will handle the commit from here so we're no longer needed - self-destruct. getSelf().tell(PoisonPill.getInstance(), getSelf());