Merge pull request #129 from jingyichen1223/ISSUE-121

ISSUE-121: fix issue
eBay · Apr 15, 2024 · b92542a · b92542a
2 parents 7d1c44c + 99c5bfb
commit b92542a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/infra/raft/v2/RaftCore.cpp b/src/infra/raft/v2/RaftCore.cpp
@@ -644,9 +644,13 @@ void RaftCore::handleAppendEntriesResponse(const AppendEntries::Response &respon
     assert(peer.mMatchIndex + 1 < peer.mNextIndex);
 
     if (response.last_log_index() < mLog->getFirstLogIndex()) {
-      // reset peer.mNextIndex until peer's data is recovered.
       auto prevNextIndex = peer.mNextIndex;
-      peer.mNextIndex = mLog->getLastLogIndex() + 1;
+      if (response.last_log_index() == 0 && mLog->getFirstLogIndex() == 1) {
+        peer.mNextIndex = response.last_log_index() + 1;
+      } else {
+        // reset peer.mNextIndex until peer's data is recovered.
+        peer.mNextIndex = mLog->getLastLogIndex() + 1;
+      }
       SPDLOG_WARN("There is gap between Follower {} lastLogIndex({}) and {} firstLogIndex({})",
                   response.id(), response.last_log_index(), selfId(), mLog->getFirstLogIndex());
       SPDLOG_INFO("{} reset Follower {}: nextIndex from {} to {}",