Skip to content

[IOTDB-1317] Log CatchUp always failed du to not check the follower's match index #3029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mychaow merged 2 commits into from
Apr 20, 2021
Merged

[IOTDB-1317] Log CatchUp always failed du to not check the follower's match index #3029

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b34854
fix the bug that Log CatchUp always failed du to not check the follow…
neuyilan Apr 19, 2021
34c902c
fix the match index is not correct when can not find match index in disk
neuyilan Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions cluster/src/main/java/org/apache/iotdb/cluster/log/catchup/CatchUpTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,26 +114,38 @@ private boolean checkMatchIndex()

int index = findLastMatchIndex(logs);
if (index == -1) {
logger.info("Cannot find matched of {} within [{}, {}] in memory", node, lo, hi);
if (judgeUseLogsInDiskToCatchUp()) {
long startIndex = peer.getMatchIndex() + 1;
long endIndex = raftMember.getLogManager().getCommitLogIndex();
List<Log> logsInDisk = getLogsInStableEntryManager(startIndex, endIndex);
if (!logsInDisk.isEmpty()) {
logger.info(
"{}, found {} logs in disk to catch up {} , startIndex={}, endIndex={}, memoryFirstIndex={}, getFirstLogIndex={}",
name,
logsInDisk.size(),
node,
startIndex,
endIndex,
localFirstIndex,
logsInDisk.get(0).getCurrLogIndex());
logs = logsInDisk;
return true;
logger.info("{}, Cannot find matched of {} within [{}, {}] in memory", name, node, lo, hi);
if (!judgeUseLogsInDiskToCatchUp()) {
return false;
}
long startIndex = peer.getMatchIndex() + 1;
long endIndex = raftMember.getLogManager().getCommitLogIndex();
List<Log> logsInDisk = getLogsInStableEntryManager(startIndex, endIndex);
if (!logsInDisk.isEmpty()) {
logger.info(
"{}, found {} logs in disk to catch up {} , startIndex={}, endIndex={}, memoryFirstIndex={}, getFirstLogIndex={}",
name,
logsInDisk.size(),
node,
startIndex,
endIndex,
localFirstIndex,
logsInDisk.get(0).getCurrLogIndex());
logs = logsInDisk;
index = findLastMatchIndex(logs);
// the follower's matchIndex may have been updated
if (index == -1) {
return false;
}
} else {
logger.info(
"{}, Cannot find matched of {} within [{}, {}] in disk",
name,
node,
startIndex,
endIndex);
return false;
}
return false;
}
long newMatchedIndex = logs.get(index).getCurrLogIndex() - 1;
if (newMatchedIndex > lastLogIndex) {
Expand Down