import org.opendaylight.controller.cluster.common.actor.MeteringBehavior;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
-import org.opendaylight.controller.cluster.datastore.identifiers.ShardTransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardMBeanFactory;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
import org.opendaylight.controller.cluster.datastore.messages.AbortTransaction;
}
}
- private ActorRef createTransaction(int transactionType, String remoteTransactionId, String transactionChainId) {
- ShardTransactionIdentifier transactionId = new ShardTransactionIdentifier(remoteTransactionId);
+ private ActorRef createTransaction(int transactionType, String transactionId, String transactionChainId) {
LOG.debug("{}: Creating transaction : {} ", persistenceId(), transactionId);
return transactionActorFactory.newShardTransaction(TransactionType.fromInt(transactionType),
transactionId, transactionChainId);
private final AbstractShardDataTreeTransaction<?> transaction;
public ShardReadTransaction(AbstractShardDataTreeTransaction<?> transaction, ActorRef shardActor,
- ShardStats shardStats, String transactionID) {
- super(shardActor, shardStats, transactionID);
+ ShardStats shardStats) {
+ super(shardActor, shardStats, transaction.getId());
this.transaction = transaction;
}
*/
public class ShardReadWriteTransaction extends ShardWriteTransaction {
public ShardReadWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor,
- ShardStats shardStats, String transactionID) {
- super(transaction, shardActor, shardStats, transactionID);
+ ShardStats shardStats) {
+ super(transaction, shardActor, shardStats);
}
@Override
import akka.actor.ActorRef;
import com.google.common.base.Preconditions;
import java.util.concurrent.ExecutionException;
-import org.opendaylight.controller.cluster.datastore.identifiers.ShardTransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.CreateSnapshot;
import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils;
import org.opendaylight.controller.cluster.raft.RaftActorSnapshotCohort;
// so that this actor does not get block building the snapshot. THe transaction actor will
// after processing the CreateSnapshot message.
- ShardTransactionIdentifier transactionID = new ShardTransactionIdentifier(
- "createSnapshot" + ++createSnapshotTransactionCounter);
-
ActorRef createSnapshotTransaction = transactionActorFactory.newShardTransaction(
- TransactionType.READ_ONLY, transactionID, "");
+ TransactionType.READ_ONLY, "createSnapshot" + ++createSnapshotTransactionCounter, "");
createSnapshotTransaction.tell(CreateSnapshot.INSTANCE, actorRef);
}
}
public static Props props(TransactionType type, AbstractShardDataTreeTransaction<?> transaction, ActorRef shardActor,
- DatastoreContext datastoreContext, ShardStats shardStats, String transactionID) {
- return Props.create(new ShardTransactionCreator(type, transaction, shardActor,
- datastoreContext, shardStats, transactionID));
+ DatastoreContext datastoreContext, ShardStats shardStats) {
+ return Props.create(new ShardTransactionCreator(type, transaction, shardActor, datastoreContext, shardStats));
}
protected abstract AbstractShardDataTreeTransaction<?> getDOMStoreTransaction();
final ActorRef shardActor;
final DatastoreContext datastoreContext;
final ShardStats shardStats;
- final String transactionID;
final TransactionType type;
ShardTransactionCreator(TransactionType type, AbstractShardDataTreeTransaction<?> transaction, ActorRef shardActor,
- DatastoreContext datastoreContext, ShardStats shardStats, String transactionID) {
+ DatastoreContext datastoreContext, ShardStats shardStats) {
this.transaction = Preconditions.checkNotNull(transaction);
this.shardActor = shardActor;
this.shardStats = shardStats;
this.datastoreContext = datastoreContext;
- this.transactionID = Preconditions.checkNotNull(transactionID);
this.type = type;
}
final ShardTransaction tx;
switch (type) {
case READ_ONLY:
- tx = new ShardReadTransaction(transaction, shardActor,
- shardStats, transactionID);
+ tx = new ShardReadTransaction(transaction, shardActor, shardStats);
break;
case READ_WRITE:
- tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction,
- shardActor, shardStats, transactionID);
+ tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor, shardStats);
break;
case WRITE_ONLY:
- tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction,
- shardActor, shardStats, transactionID);
+ tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor, shardStats);
break;
default:
throw new IllegalArgumentException("Unhandled transaction type " + type);
import akka.actor.ActorRef;
import akka.actor.UntypedActorContext;
import com.google.common.base.Preconditions;
-import org.opendaylight.controller.cluster.datastore.identifiers.ShardTransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
/**
this.shardActor = shardActor;
}
- ActorRef newShardTransaction(TransactionType type, ShardTransactionIdentifier transactionID,
- String transactionChainID) {
+ ActorRef newShardTransaction(TransactionType type, String transactionID, String transactionChainID) {
final AbstractShardDataTreeTransaction<?> transaction;
switch (type) {
case READ_ONLY:
- transaction = dataTree.newReadOnlyTransaction(transactionID.toString(), transactionChainID);
+ transaction = dataTree.newReadOnlyTransaction(transactionID, transactionChainID);
shardMBean.incrementReadOnlyTransactionCount();
break;
case READ_WRITE:
- transaction = dataTree.newReadWriteTransaction(transactionID.toString(), transactionChainID);
+ transaction = dataTree.newReadWriteTransaction(transactionID, transactionChainID);
shardMBean.incrementReadWriteTransactionCount();
break;
case WRITE_ONLY:
- transaction = dataTree.newReadWriteTransaction(transactionID.toString(), transactionChainID);
+ transaction = dataTree.newReadWriteTransaction(transactionID, transactionChainID);
shardMBean.incrementWriteOnlyTransactionCount();
break;
default:
throw new IllegalArgumentException("Unsupported transaction type " + type);
}
- return actorContext.actorOf(ShardTransaction.props(type, transaction, shardActor, datastoreContext, shardMBean,
- transactionID.getRemoteTransactionId()).withDispatcher(txnDispatcherPath),
- transactionID.toString());
+ return actorContext.actorOf(ShardTransaction.props(type, transaction, shardActor, datastoreContext, shardMBean)
+ .withDispatcher(txnDispatcherPath), "shard-" + transactionID);
}
}
private final ReadWriteShardDataTreeTransaction transaction;
public ShardWriteTransaction(ReadWriteShardDataTreeTransaction transaction, ActorRef shardActor,
- ShardStats shardStats, String transactionID) {
- super(shardActor, shardStats, transactionID);
+ ShardStats shardStats) {
+ super(shardActor, shardStats, transaction.getId());
this.transaction = transaction;
}
+++ /dev/null
-/*
- * 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
- */
-
-package org.opendaylight.controller.cluster.datastore.identifiers;
-
-import com.google.common.base.Preconditions;
-
-public class ShardTransactionIdentifier {
- private final String remoteTransactionId;
- private final String stringRepresentation;
-
- public ShardTransactionIdentifier(String remoteTransactionId) {
- this.remoteTransactionId = Preconditions.checkNotNull(remoteTransactionId,
- "remoteTransactionId should not be null");
-
- stringRepresentation = new StringBuilder(remoteTransactionId.length() + 6).append("shard-").
- append(remoteTransactionId).toString();
- }
-
- public String getRemoteTransactionId() {
- return remoteTransactionId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
-
- ShardTransactionIdentifier that = (ShardTransactionIdentifier) o;
-
- if (!remoteTransactionId.equals(that.remoteTransactionId)) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return remoteTransactionId.hashCode();
- }
-
- @Override public String toString() {
- return stringRepresentation;
- }
-
-}
final ActorRef shard = createShard();
final Props props = ShardTransaction.props(RO, store.newReadOnlyTransaction("test-txn", null), shard,
- datastoreContext, shardStats, "txn");
+ datastoreContext, shardStats);
final TestActorRef<ShardTransaction> subject = TestActorRef.create(getSystem(), props,
"testNegativeReadWithReadOnlyTransactionClosed");
final ActorRef shard = createShard();
final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard,
- datastoreContext, shardStats, "txn");
+ datastoreContext, shardStats);
final TestActorRef<ShardTransaction> subject = TestActorRef.create(getSystem(), props,
"testNegativeReadWithReadWriteTransactionClosed");
final ActorRef shard = createShard();
final Props props = ShardTransaction.props(RW, store.newReadWriteTransaction("test-txn", null), shard,
- datastoreContext, shardStats, "txn");
+ datastoreContext, shardStats);
final TestActorRef<ShardTransaction> subject = TestActorRef.create(getSystem(), props,
"testNegativeExistsWithReadWriteTransactionClosed");
private ActorRef newTransactionActor(TransactionType type, AbstractShardDataTreeTransaction<?> transaction, ActorRef shard, String name) {
Props props = ShardTransaction.props(type, transaction, shard != null ? shard : createShard(),
- datastoreContext, shardStats, "txn");
+ datastoreContext, shardStats);
return getSystem().actorOf(props, name);
}
public void testNegativePerformingWriteOperationOnReadTransaction() throws Exception {
final ActorRef shard = createShard();
final Props props = ShardTransaction.props(TransactionType.READ_ONLY, readOnlyTransaction(), shard,
- datastoreContext, shardStats, "txn");
+ datastoreContext, shardStats);
final TestActorRef<ShardTransaction> transaction = TestActorRef.apply(props,getSystem());
transaction.receive(new BatchedModifications("tx1", DataStoreVersions.CURRENT_VERSION, null),