Skip to content

Ensure memory is freed in SpoolingExchangeOutputBuffer #13717

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
arhimondr merged 1 commit into from
Aug 18, 2022
Merged

Ensure memory is freed in SpoolingExchangeOutputBuffer #13717

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
12 changes: 10 additions & 2 deletions core/trino-main/src/main/java/io/trino/execution/buffer/SpoolingExchangeOutputBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ public void setNoMorePages()
stateMachine.finish();
}
exchangeSink = null;
updateMemoryUsage(0);
forceFreeMemory();
});
}

Expand Down Expand Up @@ -234,7 +234,7 @@ public void abort()
log.warn(failure, "Error aborting exchange sink");
}
exchangeSink = null;
updateMemoryUsage(0);
forceFreeMemory();
});
}

Expand Down Expand Up @@ -272,6 +272,14 @@ private void updatePeakMemoryUsage(long bytes)
}
}

private void forceFreeMemory()
{
LocalMemoryContext context = getSystemMemoryContextOrNull();
if (context != null) {
context.close();
Copy link
Copy Markdown
Member

@sopel39 sopel39 Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not every memory context is closeable, see https://github.com/trinodb/trino/pull/13213/files#diff-1774b86bf4c8b2248f02693fe0b0c6acc38305a6773ca813f5957601207a8168R338.
I think we can assume that only memory context created from io.trino.memory.context.AggregatedMemoryContext#newAggregatedMemoryContext are closeable

Copy link
Copy Markdown
Contributor Author

@arhimondr arhimondr Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other output buffers close the memory context through the OutputBufferMemoryManager: https://github.com/trinodb/trino/blob/master/core/trino-main/src/main/java/io/trino/execution/buffer/OutputBufferMemoryManager.java#L199

The memory context is closeable. It is created in https://github.com/trinodb/trino/blob/master/core/trino-main/src/main/java/io/trino/operator/TaskContext.java#L157 through https://github.com/trinodb/trino/blob/master/lib/trino-memory-context/src/main/java/io/trino/memory/context/MemoryTrackingContext.java#L136

}
}

private LocalMemoryContext getSystemMemoryContextOrNull()
{
try {
Expand Down