Skip to content
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

Jump to bottom

ZOOKEEPER-4813: Make zookeeper start successfully when the last log file is dirty during the restore progress #2144

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −1
Open

ZOOKEEPER-4813: Make zookeeper start successfully when the last log file is dirty during the restore progress #2144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c055e93
Not throw exception when the last log file createInputArchive failed.
horizonzy Mar 7, 2024
6936255
tune code.
horizonzy Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/server/persistence/FileTxnLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,16 @@ public long getStorageSize() {
private boolean goToNextLog() throws IOException {
if (storedFiles.size() > 0) {
this.logFile = storedFiles.remove(storedFiles.size() - 1);
ia = createInputArchive(this.logFile);
try {
ia = createInputArchive(this.logFile);
} catch (EOFException e) {
if (storedFiles.isEmpty()) {
LOG.warn("The last log file {} EOF when create input archive, delete it.", logFile.getName(), e);
logFile.deleteOnExit();
return false;
}
throw e;
}
return true;
}
return false;
Expand Down