Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1593 - Flow Statistics manager is updating store with incorrect key Statis...
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
ThreePhaseCommitCohort.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohort.java
index 34d35312838fd4346e7446161cd4f1f1c8f9cc74..d0c29294cbea9b992644817436ad21fb5f81d46b 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohort.java
@@
-14,9
+14,11
@@
import akka.actor.Props;
import akka.event.Logging;
import akka.event.LoggingAdapter;
import akka.japi.Creator;
import akka.event.Logging;
import akka.event.LoggingAdapter;
import akka.japi.Creator;
+
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+
import org.opendaylight.controller.cluster.datastore.messages.AbortTransaction;
import org.opendaylight.controller.cluster.datastore.messages.AbortTransactionReply;
import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransaction;
import org.opendaylight.controller.cluster.datastore.messages.AbortTransaction;
import org.opendaylight.controller.cluster.datastore.messages.AbortTransactionReply;
import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransaction;
@@
-46,16
+48,9
@@
public class ThreePhaseCommitCohort extends AbstractUntypedActor {
public static Props props(final DOMStoreThreePhaseCommitCohort cohort,
final ActorRef shardActor, final CompositeModification modification) {
public static Props props(final DOMStoreThreePhaseCommitCohort cohort,
final ActorRef shardActor, final CompositeModification modification) {
- return Props.create(new Creator<ThreePhaseCommitCohort>() {
- @Override
- public ThreePhaseCommitCohort create() throws Exception {
- return new ThreePhaseCommitCohort(cohort, shardActor,
- modification);
- }
- });
+ return Props.create(new ThreePhaseCommitCohortCreator(cohort, shardActor, modification));
}
}
-
@Override
public void handleReceive(Object message) throws Exception {
if (message.getClass()
@Override
public void handleReceive(Object message) throws Exception {
if (message.getClass()
@@
-81,12
+76,14
@@
public class ThreePhaseCommitCohort extends AbstractUntypedActor {
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Void>() {
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Void>() {
+ @Override
public void onSuccess(Void v) {
sender
.tell(new AbortTransactionReply().toSerializable(),
self);
}
public void onSuccess(Void v) {
sender
.tell(new AbortTransactionReply().toSerializable(),
self);
}
+ @Override
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during abort");
sender
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during abort");
sender
@@
-110,12
+107,14
@@
public class ThreePhaseCommitCohort extends AbstractUntypedActor {
final ActorRef sender = getSender();
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Void>() {
final ActorRef sender = getSender();
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Void>() {
+ @Override
public void onSuccess(Void v) {
sender
.tell(new PreCommitTransactionReply().toSerializable(),
self);
}
public void onSuccess(Void v) {
sender
.tell(new PreCommitTransactionReply().toSerializable(),
self);
}
+ @Override
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during pre-commit");
sender
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during pre-commit");
sender
@@
-130,18
+129,36
@@
public class ThreePhaseCommitCohort extends AbstractUntypedActor {
final ActorRef sender = getSender();
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Boolean>() {
final ActorRef sender = getSender();
final ActorRef self = getSelf();
Futures.addCallback(future, new FutureCallback<Boolean>() {
+ @Override
public void onSuccess(Boolean canCommit) {
sender.tell(new CanCommitTransactionReply(canCommit)
.toSerializable(), self);
}
public void onSuccess(Boolean canCommit) {
sender.tell(new CanCommitTransactionReply(canCommit)
.toSerializable(), self);
}
+ @Override
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during canCommit");
sender
.tell(new akka.actor.Status.Failure(t), self);
}
});
public void onFailure(Throwable t) {
LOG.error(t, "An exception happened during canCommit");
sender
.tell(new akka.actor.Status.Failure(t), self);
}
});
+ }
+
+ private static class ThreePhaseCommitCohortCreator implements Creator<ThreePhaseCommitCohort> {
+ final DOMStoreThreePhaseCommitCohort cohort;
+ final ActorRef shardActor;
+ final CompositeModification modification;
+ ThreePhaseCommitCohortCreator(DOMStoreThreePhaseCommitCohort cohort,
+ ActorRef shardActor, CompositeModification modification) {
+ this.cohort = cohort;
+ this.shardActor = shardActor;
+ this.modification = modification;
+ }
+ @Override
+ public ThreePhaseCommitCohort create() throws Exception {
+ return new ThreePhaseCommitCohort(cohort, shardActor, modification);
+ }
}
}
}
}