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=e1b342a982c89b42955d95ac1007b4486813e810;hp=356891164628bdfd8434b620707452ffa89bf7d5;hb=4c1877fd363bf0663c91b85b2bf5be64d22e56aa;hpb=254381e31fb8a30db6428e8ebebdbb4416aa1c1a 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 3568911646..e1b342a982 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,11 +1,10 @@ /* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. * - * Copyright (c) 2014 Cisco 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, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.cluster.datastore; @@ -15,24 +14,17 @@ 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.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 @@ -40,18 +32,18 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; */ public class ShardWriteTransaction extends ShardTransaction { - private final MutableCompositeModification compositeModification = new MutableCompositeModification(); - private final DOMStoreWriteTransaction transaction; + 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; } @@ -61,51 +53,86 @@ public class ShardWriteTransaction extends ShardTransaction { 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(transaction, SERIALIZED_REPLY); + 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); + mergeData(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(compositeModification), getSelf()); + deleteData(DeleteData.fromSerializable(message), SERIALIZED_REPLY); } else { super.handleReceive(message); } } 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); + modification.apply(transaction.getSnapshot()); } + totalBatchedModificationsReceived++; if(batched.isReady()) { - readyTransaction(transaction, false); + 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(DOMStoreWriteTransaction transaction, WriteData message, - boolean returnSerialized) { + private void writeData(WriteData message, boolean returnSerialized) { LOG.debug("writeData at path : {}", message.getPath()); + if (checkClosed()) { + return; + } - 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()); @@ -114,15 +141,14 @@ 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()); - - compositeModification.addModification( - new MergeModification(message.getPath(), message.getData())); + if (checkClosed()) { + return; + } 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()); @@ -131,50 +157,33 @@ 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; + } - compositeModification.addModification(new DeleteModification(message.getPath())); try { - transaction.delete(message.getPath()); + transaction.getSnapshot().delete(message.getPath()); DeleteDataReply deleteDataReply = DeleteDataReply.INSTANCE; getSender().tell(returnSerialized ? deleteDataReply.toSerializable(message.getVersion()) : deleteDataReply, getSelf()); - }catch(Exception e){ + } 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, compositeModification, returnSerialized), getContext()); + cohort, returnSerialized, doImmediateCommit), 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 - - static class GetCompositedModification { - } - - static class GetCompositeModificationReply { - private final CompositeModification modification; - - - GetCompositeModificationReply(CompositeModification modification) { - this.modification = modification; - } - - public CompositeModification getModification() { - return modification; - } - } }