From c90b3cfcb48dd75cc3cc6305aaac1bbabad8d9fe Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Wed, 11 Mar 2015 20:00:06 -0400 Subject: [PATCH] Change in AbstractRaftBehavior#performSnapshotWithoutCapture If tempMin isn't present in the log and tempMin is grater than the current replicatedToAllIndex, then update replicatedToAllIndex to tempMin. Details are in the code comments. Change-Id: I373d5c4b7ce9fd2504f2a4fa996b49a6d9ffe5b6 Signed-off-by: Tom Pantelis --- .../raft/behaviors/AbstractRaftActorBehavior.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java index e814cd000d..a1bcf8541c 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java @@ -464,6 +464,11 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { long lastApplied = context.getLastApplied(); long tempMin = Math.min(snapshotCapturedIndex, (lastApplied > -1 ? lastApplied - 1 : -1)); + if(LOG.isTraceEnabled()) { + LOG.trace("{}: performSnapshotWithoutCapture: snapshotCapturedIndex: {}, lastApplied: {}, tempMin: {}", + logName, snapshotCapturedIndex, lastApplied, tempMin); + } + if (tempMin > -1 && context.getReplicatedLog().isPresent(tempMin)) { LOG.debug("{}: fakeSnapshot purging log to {} for term {}", logName(), tempMin, context.getTermInformation().getCurrentTerm()); @@ -473,6 +478,13 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { context.getReplicatedLog().snapshotPreCommit(tempMin, entry.getTerm()); context.getReplicatedLog().snapshotCommit(); setReplicatedToAllIndex(tempMin); + } else if(tempMin > getReplicatedToAllIndex()) { + // It's possible a follower was lagging and an install snapshot advanced its match index past + // the current replicatedToAllIndex. Since the follower is now caught up we should advance the + // replicatedToAllIndex (to tempMin). The fact that tempMin wasn't found in the log is likely + // due to a previous snapshot triggered by the memory threshold exceeded, in that case we + // trim the log to the last applied index even if previous entries weren't replicated to all followers. + setReplicatedToAllIndex(tempMin); } } -- 2.36.6