diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-07-10 18:22:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-10 18:22:45 +0200 |
commit | 7f9223e95359713ff897d96414e167ae3d62795b (patch) | |
tree | e46b3f31705ca3b95301c87214a860cb0d94adb7 | |
parent | 6a7d07037ce40a637441078afe6951c00d189e7b (diff) | |
parent | 1a9f53de670ec01576f9993dc66fd08c26cc384d (diff) |
Merge pull request #10013 from vespa-engine/freva/do-not-set-memory-variable
Remove VESPA_TOTAL_MEMORY_MB
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index bcdcb615f06..4abc4182dd5 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -109,15 +109,6 @@ public class DockerOperationsImpl implements DockerOperations { addMounts(context, command); - // TODO: Enforce disk constraints - long minMainMemoryAvailableMb = (long) (context.node().memoryGb() * 1024); - if (minMainMemoryAvailableMb > 0) { - // VESPA_TOTAL_MEMORY_MB is used to make any jdisc container think the machine - // only has this much physical memory (overrides total memory reported by `free -m`). - // TODO: Remove after all tenants are running > 7.67 - command.withEnvironment("VESPA_TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb)); - } - logger.info("Creating new container with args: " + command); command.create(); } |