diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-07-15 14:58:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-15 14:58:54 +0200 |
commit | a95151a3a334c544eb993e91d1d90a9ac2bb6b1d (patch) | |
tree | 5d8c3444bd9ec5f4bad83fbb20d901b309cea7df | |
parent | 247395232187732f7bc416c6c8ace8029d42329e (diff) |
Revert "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, 9 insertions, 0 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 d7e0605de10..aa537d4f69a 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,6 +109,15 @@ 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(); } |