summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-07-10 16:57:41 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-07-10 16:57:41 +0200
commit1a9f53de670ec01576f9993dc66fd08c26cc384d (patch)
tree55a1ab3def1ece983e43f55144fedb4c7e276c6b /node-admin
parentc0cba948d458122e8d3af1c00e0eb5f6e923504a (diff)
Remove VESPA_TOTAL_MEMORY_MB
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java9
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();
}