archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8198833: TestMemoryAwareness Docker container fails with too small maximum heap

Browse source 
Reviewed-by: bobv, dholmes
This commit is contained in:
Robbin Ehn 2018-03-02 11:43:19 +01:00
parent fc389b5284
commit f4bb0fe332
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/hotspot/os/linux/os_linux.cpp
View file

@ -203,7 +203,7 @@ julong os::physical_memory() {
jlong mem_limit; jlong mem_limit;
if ((mem_limit = OSContainer::memory_limit_in_bytes()) > 0) { if ((mem_limit = OSContainer::memory_limit_in_bytes()) > 0) {
log_trace(os)("total container memory: " JLONG_FORMAT, mem_limit); log_trace(os)("total container memory: " JLONG_FORMAT, mem_limit);
return phys_mem; return mem_limit;
} }
log_debug(os, container)("container memory limit %s: " JLONG_FORMAT ", using host value", log_debug(os, container)("container memory limit %s: " JLONG_FORMAT ", using host value",
mem_limit == OSCONTAINER_ERROR ? "failed" : "unlimited", mem_limit); mem_limit == OSCONTAINER_ERROR ? "failed" : "unlimited", mem_limit);