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;
}
if (shard.hasLeader()) {
- log.debug("Retrying commit for BatchedModifications {}", inflightCommit.getTransactionID());
+ log.debug("Retrying commit for BatchedModifications {}", inflightCommit.getTransactionId());
shard.tryCommitModifications(inflightCommit);
} else {
return;
}
- log.debug("Inflight BatchedModifications {} commit failed", inflightCommit.getTransactionID(), cause);
+ log.debug("Inflight BatchedModifications {} commit failed", inflightCommit.getTransactionId(), cause);
if (!(cause instanceof NoShardLeaderException)) {
// If the failure is other than NoShardLeaderException the commit may have been partially
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());
retryCommitSchedule.cancel();
}
- log.debug("BatchedModifications commit {} succeeded", inflightCommit.getTransactionID());
+ log.debug("BatchedModifications commit {} succeeded", inflightCommit.getTransactionId());
inflightCommit = null;
commitNextBatch(shard);
}
}
- 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;
}
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);
}
}
}
// 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(),
+ 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)) {
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;
}