Skip to content

[GR-45673] Improve fallback max heap behavior of builder. #6581

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
merged 1 commit into from
May 10, 2023
Merged

[GR-45673] Improve fallback max heap behavior of builder. #6581

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
14 changes: 11 additions & 3 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/MemoryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MemoryUtil {
private static final long MAX_HEAP_BYTES = 32_000_000_000L;

/* Use 80% of total system memory in case available memory cannot be determined. */
private static final double FALLBACK_MAX_RAM_PERCENTAGE = 80.0;
private static final double FALLBACK_TOTAL_MEMORY_RATIO = 0.8;

public static List<String> determineMemoryFlags() {
return List.of(
Expand Down Expand Up @@ -88,7 +88,13 @@ private static double determineReasonableMaxRAMPercentage() {
case WINDOWS -> getAvailableMemorySizeWindows();
};
if (reasonableMaxMemorySize < 0 || reasonableMaxMemorySize > totalMemorySize) {
return FALLBACK_MAX_RAM_PERCENTAGE;
/*
* The amount of available memory was not at all or incorrectly detected. Fall back to a
* value based on total memory. OperatingSystemMXBean.getTotalMemorySize() is
* container-aware whereas, for example, /proc/meminfo is not and thus may report
* available memory of the host which can exceed the memory limit of a container.
*/
reasonableMaxMemorySize = (long) (totalMemorySize * FALLBACK_TOTAL_MEMORY_RATIO);
}
if (reasonableMaxMemorySize < MIN_HEAP_BYTES) {
throw new NativeImageError(
Expand All @@ -102,7 +108,9 @@ private static double determineReasonableMaxRAMPercentage() {

/**
* Returns the total amount of available memory in bytes on Linux based on
* <code>/proc/meminfo</code>, otherwise <code>-1</code>.
* <code>/proc/meminfo</code>, otherwise <code>-1</code>. Note that this metric is not
* container-aware (does not take cgroups into account) and may report available memory of the
* host.
*
* @see <a href=
* "https://github.com/torvalds/linux/blob/865fdb08197e657c59e74a35fa32362b12397f58/mm/page_alloc.c#L5137">page_alloc.c#L5137</a>
Expand Down