import akka.actor.Cancellable;
import akka.actor.Status.Failure;
import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableList;
import java.util.Iterator;
import java.util.LinkedList;
+import java.util.List;
import java.util.Queue;
import javax.annotation.Nullable;
import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier;
boolean handleMessage(Object message, EntityOwnershipShard shard) {
boolean handled = true;
- if(CommitTransactionReply.isSerializedType(message)) {
+ if (CommitTransactionReply.isSerializedType(message)) {
// Successful reply from a local commit.
inflightCommitSucceeded(shard);
- } else if(message instanceof akka.actor.Status.Failure) {
+ } else if (message instanceof akka.actor.Status.Failure) {
// Failure reply from a local commit.
- inflightCommitFailure(((Failure)message).cause(), shard);
- } else if(COMMIT_RETRY_MESSAGE.equals(message)) {
+ inflightCommitFailure(((Failure) message).cause(), shard);
+ } else if (COMMIT_RETRY_MESSAGE.equals(message)) {
retryInflightCommit(shard);
} else {
handled = false;
private void retryInflightCommit(EntityOwnershipShard shard) {
// Shouldn't be null happen but verify anyway
- if(inflightCommit == null) {
+ if (inflightCommit == null) {
return;
}
- if(shard.hasLeader()) {
- log.debug("Retrying commit for BatchedModifications {}", inflightCommit.getTransactionID());
+ if (shard.hasLeader()) {
+ log.debug("Retrying commit for BatchedModifications {}", inflightCommit.getTransactionId());
shard.tryCommitModifications(inflightCommit);
} else {
void inflightCommitFailure(Throwable cause, EntityOwnershipShard shard) {
// This should've originated from a failed inflight commit but verify anyway
- if(inflightCommit == null) {
+ if (inflightCommit == null) {
return;
}
- log.debug("Inflight BatchedModifications {} commit failed", inflightCommit.getTransactionID(), cause);
+ log.debug("Inflight BatchedModifications {} commit failed", inflightCommit.getTransactionId(), cause);
- if(!(cause instanceof NoShardLeaderException)) {
+ if (!(cause instanceof NoShardLeaderException)) {
// If the failure is other than NoShardLeaderException the commit may have been partially
// processed so retry with a new transaction ID to be safe.
newInflightCommitWithDifferentTransactionID();
FiniteDuration duration = shard.getDatastoreContext().getShardRaftConfig().getElectionTimeOutInterval();
log.debug("Scheduling retry for BatchedModifications commit {} in {}",
- inflightCommit.getTransactionID(), duration);
+ inflightCommit.getTransactionId(), duration);
retryCommitSchedule = shard.getContext().system().scheduler().scheduleOnce(duration, shard.getSelf(),
COMMIT_RETRY_MESSAGE, shard.getContext().dispatcher(), ActorRef.noSender());
void inflightCommitSucceeded(EntityOwnershipShard shard) {
// Shouldn't be null but verify anyway
- if(inflightCommit == null) {
+ if (inflightCommit == null) {
return;
}
- if(retryCommitSchedule != null) {
+ if (retryCommitSchedule != null) {
retryCommitSchedule.cancel();
}
- log.debug("BatchedModifications commit {} succeeded", inflightCommit.getTransactionID());
+ log.debug("BatchedModifications commit {} succeeded", inflightCommit.getTransactionId());
inflightCommit = null;
commitNextBatch(shard);
}
void commitNextBatch(EntityOwnershipShard shard) {
- if(inflightCommit != null || pendingModifications.isEmpty() || !shard.hasLeader()) {
+ if (inflightCommit != null || pendingModifications.isEmpty() || !shard.hasLeader()) {
return;
}
inflightCommit = newBatchedModifications();
Iterator<Modification> iter = pendingModifications.iterator();
- while(iter.hasNext()) {
+ while (iter.hasNext()) {
inflightCommit.addModification(iter.next());
iter.remove();
- if(inflightCommit.getModifications().size() >=
- shard.getDatastoreContext().getShardBatchedModificationCount()) {
+ if (inflightCommit.getModifications().size()
+ >= shard.getDatastoreContext().getShardBatchedModificationCount()) {
break;
}
}
- log.debug("Committing next BatchedModifications {}, size {}", inflightCommit.getTransactionID(),
+ log.debug("Committing next BatchedModifications {}, size {}", inflightCommit.getTransactionId(),
inflightCommit.getModifications().size());
shard.tryCommitModifications(inflightCommit);
}
void commitModification(Modification modification, EntityOwnershipShard shard) {
- BatchedModifications modifications = newBatchedModifications();
- modifications.addModification(modification);
- commitModifications(modifications, shard);
+ commitModifications(ImmutableList.of(modification), shard);
}
- void commitModifications(BatchedModifications modifications, EntityOwnershipShard shard) {
- if(modifications.getModifications().isEmpty()) {
+ void commitModifications(List<Modification> modifications, EntityOwnershipShard shard) {
+ if (modifications.isEmpty()) {
return;
}
boolean hasLeader = shard.hasLeader();
- if(inflightCommit != null || !hasLeader) {
- if(log.isDebugEnabled()) {
+ if (inflightCommit != null || !hasLeader) {
+ if (log.isDebugEnabled()) {
log.debug("{} - adding modifications to pending",
inflightCommit != null ? "A commit is inflight" : "No shard leader");
}
- pendingModifications.addAll(modifications.getModifications());
+ pendingModifications.addAll(modifications);
} else {
- inflightCommit = modifications;
+ inflightCommit = newBatchedModifications();
+ inflightCommit.addModifications(modifications);
shard.tryCommitModifications(inflightCommit);
}
}
possiblyPrunePendingCommits(shard, isLeader);
- if(!isLeader && inflightCommit != null) {
+ if (!isLeader && inflightCommit != null) {
// We're no longer the leader but we have an inflight local commit. This likely means we didn't get
// consensus for the commit and switched to follower due to another node with a higher term. We
// can't be sure if the commit was replicated to any node so we retry it here with a new
// transaction ID.
- if(retryCommitSchedule != null) {
+ if (retryCommitSchedule != null) {
retryCommitSchedule.cancel();
}
shard.convertPendingTransactionsToMessages();
// Prune the inflightCommit.
- if(inflightCommit != null) {
+ if (inflightCommit != null) {
inflightCommit = pruneModifications(inflightCommit);
}
// Prune the subsequent pending modifications.
- Iterator<Modification> iter = pendingModifications.iterator();
- while(iter.hasNext()) {
- Modification mod = iter.next();
- if(!canForwardModificationToNewLeader(mod)) {
- iter.remove();
- }
- }
+ pendingModifications.removeIf(mod -> !canForwardModificationToNewLeader(mod));
}
}
@Nullable
private BatchedModifications pruneModifications(BatchedModifications toPrune) {
- BatchedModifications prunedModifications = new BatchedModifications(toPrune.getTransactionID(), toPrune.getVersion());
+ BatchedModifications prunedModifications = new BatchedModifications(toPrune.getTransactionId(),
+ toPrune.getVersion());
prunedModifications.setDoCommitOnReady(toPrune.isDoCommitOnReady());
- prunedModifications.setReady(toPrune.isReady());
+ if (toPrune.isReady()) {
+ prunedModifications.setReady(toPrune.getParticipatingShardNames());
+ }
prunedModifications.setTotalMessagesSent(toPrune.getTotalMessagesSent());
- for(Modification mod: toPrune.getModifications()) {
- if(canForwardModificationToNewLeader(mod)) {
+ for (Modification mod: toPrune.getModifications()) {
+ if (canForwardModificationToNewLeader(mod)) {
prunedModifications.addModification(mod);
}
}
private void newInflightCommitWithDifferentTransactionID() {
BatchedModifications newBatchedModifications = newBatchedModifications();
- newBatchedModifications.getModifications().addAll(inflightCommit.getModifications());
+ newBatchedModifications.addModifications(inflightCommit.getModifications());
inflightCommit = newBatchedModifications;
}
- BatchedModifications newBatchedModifications() {
+ private BatchedModifications newBatchedModifications() {
BatchedModifications modifications = new BatchedModifications(
new TransactionIdentifier(historyId, ++transactionIDCounter), DataStoreVersions.CURRENT_VERSION);
modifications.setDoCommitOnReady(true);
- modifications.setReady(true);
+ modifications.setReady();
modifications.setTotalMessagesSent(1);
return modifications;
}
Code Review / controller.git / blobdiff