diff options
author | gjoranv <gv@oath.com> | 2018-12-12 12:04:21 +0100 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-12-12 12:04:21 +0100 |
commit | 7cb63ebe0c9eabc23a569044ec6d9fbf3f1a5a13 (patch) | |
tree | c2117025ab6240ba3e0cd9d6782db746182f4a6f /jdisc_http_service/src/main/java | |
parent | 001c1d6da54d2b052b5b677356be43136c4d8474 (diff) |
Revert "Change memory threshold to a percentage of total memory"
This reverts commit 2db810113ffc50b26cae63c034cdf0f33b859c64.
Diffstat (limited to 'jdisc_http_service/src/main/java')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java index 79a4f93d1df..370ac0aa788 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java @@ -40,8 +40,8 @@ class ConnectionThrottler { if (config.maxConnections() != -1) { beans.add(new CoordinatedConnectionLimit(config.maxConnections(), idleTimeout)); } - if (config.maxHeapUtilization() != -1) { - beans.add(new CoordinatedLowResourcesLimit(config.maxHeapUtilization(), idleTimeout)); + if (config.maxMemoryUsage() != -1) { + beans.add(new CoordinatedLowResourcesLimit(config.maxMemoryUsage(), idleTimeout)); } } @@ -70,16 +70,12 @@ class ConnectionThrottler { } resetters.forEach(Runnable::run); } - private static long toMaxMemoryUsageInBytes(double maxHeapUtilization) { - return (long) (maxHeapUtilization * Runtime.getRuntime().maxMemory()); - } private class CoordinatedLowResourcesLimit extends LowResourceMonitor { - - CoordinatedLowResourcesLimit(double maxHeapUtilization, Duration idleTimeout) { + CoordinatedLowResourcesLimit(int maxMemoryUsageMegaBytes, Duration idleTimeout) { super(connector.getServer()); super.setMonitoredConnectors(singleton(connector)); - super.setMaxMemory(toMaxMemoryUsageInBytes(maxHeapUtilization)); + super.setMaxMemory(maxMemoryUsageMegaBytes * 1024 * 1024L); super.setLowResourcesIdleTimeout((int)idleTimeout.toMillis()); } @@ -94,8 +90,8 @@ class ConnectionThrottler { ConnectionThrottler.this.onReset(); } } - private class CoordinatedConnectionLimit extends ConnectionLimit { + private class CoordinatedConnectionLimit extends ConnectionLimit { CoordinatedConnectionLimit(int maxConnections, Duration idleTimeout) { super(maxConnections, connector); super.setIdleTimeout(idleTimeout.toMillis()); |