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=4ae54d3e5f727856c93a6f896e7630f21e11c10d;hp=365f97dd3f8f7797ceb953f2b9b71606b4ba099b;hb=24c074a4b32ac97980a652b78824b7c2f97ffb78;hpb=cac7138ddd81d1cc801d4b6cd9bc4372e0a8ddd3 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 365f97dd3f..4ae54d3e5f 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. - * - * 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 + * 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, + * and is available at http://www.eclipse.org/legal/epl-v10.html */ package org.opendaylight.controller.cluster.datastore; @@ -16,21 +15,9 @@ 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; /** * @author: syedbahm @@ -38,14 +25,13 @@ import org.opendaylight.controller.cluster.datastore.modification.WriteModificat */ public class ShardWriteTransaction extends ShardTransaction { - private final MutableCompositeModification compositeModification = new MutableCompositeModification(); private int totalBatchedModificationsReceived; private Exception lastBatchedModificationsException; private final ReadWriteShardDataTreeTransaction transaction; public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor, - ShardStats shardStats, String transactionID, short clientTxVersion) { - super(shardActor, shardStats, transactionID, clientTxVersion); + ShardStats shardStats) { + super(shardActor, shardStats, transaction.getId()); this.transaction = transaction; } @@ -55,26 +41,9 @@ public class ShardWriteTransaction extends ShardTransaction { } @Override - public void handleReceive(Object message) throws Exception { - + public void handleReceive(Object message) { if (message instanceof BatchedModifications) { batchedModifications((BatchedModifications)message); - } else if (message instanceof ReadyTransaction) { - readyTransaction(!SERIALIZED_REPLY, false); - } else if(ReadyTransaction.SERIALIZABLE_CLASS.equals(message.getClass())) { - readyTransaction(SERIALIZED_REPLY, false); - } else if(WriteData.isSerializedType(message)) { - writeData(WriteData.fromSerializable(message), SERIALIZED_REPLY); - - } else if(MergeData.isSerializedType(message)) { - mergeData(MergeData.fromSerializable(message), 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(compositeModification), getSelf()); } else { super.handleReceive(message); } @@ -90,7 +59,6 @@ public class ShardWriteTransaction extends ShardTransaction { try { for(Modification modification: batched.getModifications()) { - compositeModification.addModification(modification); modification.apply(transaction.getSnapshot()); } @@ -106,7 +74,7 @@ public class ShardWriteTransaction extends ShardTransaction { totalBatchedModificationsReceived, batched.getTotalMessagesSent())); } - readyTransaction(false, batched.isDoCommitOnReady()); + readyTransaction(false, batched.isDoCommitOnReady(), batched.getVersion()); } else { getSender().tell(new BatchedModificationsReply(batched.getModifications().size()), getSelf()); } @@ -120,12 +88,12 @@ public class ShardWriteTransaction extends ShardTransaction { } } - protected final void dataExists(DataExists message, final boolean returnSerialized) { - super.dataExists(transaction, message, returnSerialized); + protected final void dataExists(DataExists message) { + super.dataExists(transaction, message); } - protected final void readData(ReadData message, final boolean returnSerialized) { - super.readData(transaction, message, returnSerialized); + protected final void readData(ReadData message) { + super.readData(transaction, message); } private boolean checkClosed() { @@ -137,89 +105,15 @@ public class ShardWriteTransaction extends ShardTransaction { } } - 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.getSnapshot().write(message.getPath(), message.getData()); - 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(MergeData message, boolean returnSerialized) { - LOG.debug("mergeData at path : {}", message.getPath()); - if (checkClosed()) { - return; - } - - compositeModification.addModification( - new MergeModification(message.getPath(), message.getData())); - - try { - transaction.getSnapshot().merge(message.getPath(), message.getData()); - 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(DeleteData message, boolean returnSerialized) { - LOG.debug("deleteData at path : {}", message.getPath()); - if (checkClosed()) { - return; - } - - compositeModification.addModification(new DeleteModification(message.getPath())); - try { - 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(boolean returnSerialized, boolean doImmediateCommit) { + private void readyTransaction(boolean returnSerialized, boolean doImmediateCommit, short clientTxVersion) { String transactionID = getTransactionID(); LOG.debug("readyTransaction : {}", transactionID); - ShardDataTreeCohort cohort = transaction.ready(); - - getShardActor().forward(new ForwardedReadyTransaction(transactionID, getClientTxVersion(), - cohort, compositeModification, returnSerialized, doImmediateCommit), getContext()); + getShardActor().forward(new ForwardedReadyTransaction(transactionID, clientTxVersion, + transaction, 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; - } - } }