Skip to content

Forget to close preAllocator log on shutdown #2819

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
merlimat merged 3 commits into from
Oct 22, 2021
Merged

Forget to close preAllocator log on shutdown #2819

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5baab9e
Forget to close preAllocator log on shutdown
Oct 10, 2021
490ec16
Fix synchronize problem
Oct 10, 2021
cd01e4d
handle InterruptedException
Oct 10, 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
21 changes: 20 additions & 1 deletion bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/EntryLoggerAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import lombok.extern.slf4j.Slf4j;
import org.apache.bookkeeper.bookie.EntryLogger.BufferedLogChannel;
Expand Down Expand Up @@ -182,6 +183,24 @@ private synchronized BufferedLogChannel allocateNewLog(File dirForNextEntryLog,
return logChannel;
}


private synchronized void closePreAllocateLog() {
if (preallocatedLogId != -1) {
// if preallocate new log success, release the file channel
try {
BufferedLogChannel bufferedLogChannel = getPreallocationFuture().get(3, TimeUnit.SECONDS);
if (bufferedLogChannel != null) {
bufferedLogChannel.close();
}
} catch (InterruptedException e) {
log.warn("interrupted while release preAllocate log");
Thread.currentThread().interrupt();
} catch (IOException | ExecutionException | TimeoutException e) {
log.warn("release preAllocate log failed, ignore error");
}
}
}

/**
* writes the given id to the "lastId" file in the given directory.
*/
Expand All @@ -208,6 +227,7 @@ private void setLastLogId(File dir, long logId) throws IOException {
*/
void stop() {
// wait until the preallocation finished.
allocatorExecutor.execute(this::closePreAllocateLog);
allocatorExecutor.shutdown();
try {
if (!allocatorExecutor.awaitTermination(5, TimeUnit.SECONDS)) {
Expand All @@ -218,7 +238,6 @@ void stop() {
Thread.currentThread().interrupt();
}
allocatorExecutor.shutdownNow();

log.info("Stopped entry logger preallocator.");
}

Expand Down