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

fix(compaction): prevent double release on compaction shutdown #2115

Merged
merged 1 commit into from
Nov 5, 2024
+8 −2
Merged

fix(compaction): prevent double release on compaction shutdown #2115

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions s3stream/src/main/java/com/automq/stream/s3/StreamDataBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@ public CompletableFuture<ByteBuf> getDataCf() {
return this.dataCf;
}

public ByteBuf getAndReleaseData() {
if (refCount.getAndDecrement() == 0) {
throw new IllegalStateException("Data has already been released");
}
return this.dataCf.join();
}

public void releaseRef() {
refCount.decrementAndGet();
}
Expand Down
3 changes: 1 addition & 2 deletions s3stream/src/main/java/com/automq/stream/s3/compact/operator/DataBlockWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ public CompletableFuture<Void> close() {
private CompositeByteBuf groupWaitingBlocks() {
CompositeByteBuf buf = ByteBufAlloc.compositeByteBuffer();
for (StreamDataBlock block : waitingUploadBlocks) {
buf.addComponent(true, block.getDataCf().join());
block.releaseRef();
buf.addComponent(true, block.getAndReleaseData());
completedBlocks.add(block);
nextDataBlockPosition += block.getBlockSize();
}
Expand Down
Loading