Skip to content

fix: memory leak in CompactionUploader during shutdown #3464

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

Open
vishalmaurya850 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −0
Open

fix: memory leak in CompactionUploader during shutdown #3464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 21 additions & 0 deletions s3stream/src/main/java/com/automq/stream/s3/compact/CompactionUploader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public CompactionUploader(ObjectManager objectManager, ObjectStorage objectStora

public void shutdown() {
this.isShutdown = true;
this.isAborted = true;
this.streamSetObjectUploadPool.shutdown();
try {
if (!this.streamSetObjectUploadPool.awaitTermination(10, TimeUnit.SECONDS)) {
Expand All @@ -79,6 +80,15 @@ public void shutdown() {
}
} catch (InterruptedException ignored) {
}

if (streamSetObjectWriter != null) {
streamSetObjectWriter.release().whenComplete((nil, ex) -> {
if (ex != null) {
LOGGER.warn("Failed to release stream set object writer during shutdown", ex);
}
});
streamSetObjectWriter = null;
}
}

public CompletableFuture<Void> chainWriteStreamSetObject(CompletableFuture<Void> prev,
Expand All @@ -100,6 +110,10 @@ private CompletableFuture<Void> prepareObjectAndWrite(CompactedObject compactedO
streamSetObjectIdCf = this.objectManager.prepareObject(1, TimeUnit.MINUTES.toMillis(CompactionConstants.S3_OBJECT_TTL_MINUTES));
}
return streamSetObjectIdCf.thenComposeAsync(objectId -> {
if (isAborted) {
compactedObject.streamDataBlocks().forEach(StreamDataBlock::release);
return CompletableFuture.completedFuture(null);
}
if (streamSetObjectWriter == null) {
streamSetObjectWriter = new DataBlockWriter(objectId, objectStorage, config.objectPartSize());
}
Expand All @@ -122,6 +136,13 @@ public CompletableFuture<StreamObject> writeStreamObject(CompactedObject compact
return CompletableFuture.completedFuture(null);
}
DataBlockWriter dataBlockWriter = new DataBlockWriter(objectId, objectStorage, config.objectPartSize());
// Re-check isAborted after allocating the writer to handle the race where
// shutdown() is called between the first check and writer creation.
if (isAborted) {
dataBlockWriter.release();
compactedObject.streamDataBlocks().forEach(StreamDataBlock::release);
return CompletableFuture.completedFuture(null);
}
CompletableFuture<Void> cf = CompactionUtils.chainWriteDataBlock(dataBlockWriter, compactedObject.streamDataBlocks(), streamObjectUploadPool);
return cf.thenCompose(nil -> dataBlockWriter.close()).thenApply(nil -> {
StreamObject streamObject = new StreamObject();
Expand Down
Loading