OpenJDK / amber / amber
changeset 49183:48b6b247eb7a
8194086: Remove deprecated experimental flag UseCGroupMemoryLimitForHeap
Summary: Remove the option and the code that checks for it.
Reviewed-by: dholmes, lfoltan
| author | hseigel |
|---|---|
| date | Mon, 22 Jan 2018 14:04:07 -0500 |
| parents | ffb00d255511 |
| children | d4da6c690dad |
| files | src/hotspot/share/runtime/arguments.cpp src/hotspot/share/runtime/globals.hpp |
| diffstat | 2 files changed, 0 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/runtime/arguments.cpp Wed Jan 17 13:21:38 2018 +0800 +++ b/src/hotspot/share/runtime/arguments.cpp Mon Jan 22 14:04:07 2018 -0500 @@ -509,7 +509,6 @@ { "SafepointSpinBeforeYield", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, { "DeferThrSuspendLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, { "DeferPollingPageLoopCount", JDK_Version::jdk(10), JDK_Version::jdk(11), JDK_Version::jdk(12) }, - { "UseCGroupMemoryLimitForHeap", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::jdk(11) }, { "IgnoreUnverifiableClassesDuringDump", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, { "CheckEndorsedAndExtDirs", JDK_Version::jdk(10), JDK_Version::undefined(), JDK_Version::undefined() }, @@ -1856,32 +1855,6 @@ FLAG_IS_DEFAULT(MaxRAM) ? MIN2(os::physical_memory(), (julong)MaxRAM) : (julong)MaxRAM; - // Experimental support for CGroup memory limits - if (UseCGroupMemoryLimitForHeap) { - // This is a rough indicator that a CGroup limit may be in force - // for this process - const char* lim_file = "/sys/fs/cgroup/memory/memory.limit_in_bytes"; - FILE *fp = fopen(lim_file, "r"); - if (fp != NULL) { - julong cgroup_max = 0; - int ret = fscanf(fp, JULONG_FORMAT, &cgroup_max); - if (ret == 1 && cgroup_max > 0) { - // If unlimited, cgroup_max will be a very large, but unspecified - // value, so use initial phys_mem as a limit - log_info(gc, heap)("Setting phys_mem to the min of cgroup limit (" - JULONG_FORMAT "MB) and initial phys_mem (" - JULONG_FORMAT "MB)", cgroup_max/M, phys_mem/M); - phys_mem = MIN2(cgroup_max, phys_mem); - } else { - warning("Unable to read/parse cgroup memory limit from %s: %s", - lim_file, errno != 0 ? strerror(errno) : "unknown error"); - } - fclose(fp); - } else { - warning("Unable to open cgroup memory limit file %s (%s)", lim_file, strerror(errno)); - } - } - // Convert deprecated flags if (FLAG_IS_DEFAULT(MaxRAMPercentage) && !FLAG_IS_DEFAULT(MaxRAMFraction))
--- a/src/hotspot/share/runtime/globals.hpp Wed Jan 17 13:21:38 2018 +0800 +++ b/src/hotspot/share/runtime/globals.hpp Mon Jan 22 14:04:07 2018 -0500 @@ -2042,11 +2042,6 @@ "MaxRAM * MaxRAMPercentage / 100") \ range(0, max_uintx) \ \ - experimental(bool, UseCGroupMemoryLimitForHeap, false, \ - "Use CGroup memory limit as physical memory limit for heap " \ - "sizing" \ - "Deprecated, replaced by container support") \ - \ product(uintx, MaxRAMFraction, 4, \ "Maximum fraction (1/n) of real memory used for maximum heap " \ "size. " \