From bb817d2b20a252f3acde329cba6ce98c592cd847 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 29 Dec 2015 21:39:55 -0500 Subject: [PATCH] Bug 4850: Fix follower out-of-sync logic wrt replicatedToAllIndex If the AppendEntries prevLogIndex is -1 and replicatedToAllIndex != -1, it flags the follower as out-of-sync if there's no log entry for replicatedToAllIndex. However replicatedToAllIndex may be in the snapshot so I added a check for that as well. This fixes the issue described in bug 4850. Change-Id: If499dadc5f2a3c3823d617e60410b0f63df389d7 Signed-off-by: Tom Pantelis --- .../controller/cluster/raft/behaviors/Follower.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index 5952dc087f..57b1d92c72 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -283,7 +283,8 @@ public class Follower extends AbstractRaftActorBehavior { logName(), prevLogTerm, appendEntries.getPrevLogTerm()); } else if(appendEntries.getPrevLogIndex() == -1 && appendEntries.getPrevLogTerm() == -1 && appendEntries.getReplicatedToAllIndex() != -1 - && !isLogEntryPresent(appendEntries.getReplicatedToAllIndex())) { + && !isLogEntryPresent(appendEntries.getReplicatedToAllIndex()) + && !context.getReplicatedLog().isInSnapshot(appendEntries.getReplicatedToAllIndex())) { // This append entry comes from a leader who has it's log aggressively trimmed and so does not have // the previous entry in it's in-memory journal @@ -291,8 +292,9 @@ public class Follower extends AbstractRaftActorBehavior { "{}: Cannot append entries because the replicatedToAllIndex {} does not appear to be in the in-memory journal", logName(), appendEntries.getReplicatedToAllIndex()); } else if(appendEntries.getPrevLogIndex() == -1 && appendEntries.getPrevLogTerm() == -1 - && appendEntries.getReplicatedToAllIndex() != -1 && numLogEntries > 0 && - !isLogEntryPresent(appendEntries.getEntries().get(0).getIndex() - 1)){ + && appendEntries.getReplicatedToAllIndex() != -1 && numLogEntries > 0 + && !isLogEntryPresent(appendEntries.getEntries().get(0).getIndex() - 1) + && !context.getReplicatedLog().isInSnapshot(appendEntries.getEntries().get(0).getIndex() - 1)) { LOG.debug( "{}: Cannot append entries because the calculated previousIndex {} was not found in the in-memory journal", logName(), appendEntries.getEntries().get(0).getIndex() - 1); -- 2.36.6