import akka.japi.Creator;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering;
-import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionReply;
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering {
private final ActorRef shardActor;
private final ShardStats shardStats;
- private final String transactionID;
+ private final TransactionIdentifier transactionID;
- protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, String transactionID) {
+ protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, TransactionIdentifier transactionID) {
super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name
this.shardActor = shardActor;
this.shardStats = shardStats;
}
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();
return shardActor;
}
- protected String getTransactionID() {
+ protected final TransactionIdentifier getTransactionID() {
return transactionID;
}
@Override
- public void handleReceive(Object message) throws Exception {
+ public void handleReceive(Object message) {
if (CloseTransaction.isSerializedType(message)) {
closeTransaction(true);
} else if (message instanceof ReceiveTimeout) {
- if(LOG.isDebugEnabled()) {
- LOG.debug("Got ReceiveTimeout for inactivity - closing Tx");
- }
+ LOG.debug("Got ReceiveTimeout for inactivity - closing transaction {}", transactionID);
closeTransaction(false);
} else {
- throw new UnknownMessageException(message);
+ unknownMessage(message);
}
}
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);