diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 16:58:19 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-09-18 16:58:19 +0200 |
| commit | 989e80984bd505ba6d2479d050d9aa74481568d8 (patch) | |
| tree | 451348f020e4a1e1f30c42390a62445bccc5a74b /node-admin | |
| parent | 6ba38b2278867c90248c715115e603c251da0efe (diff) | |
Do not set VESPA_TOTAL_MEMORY_MB
Diffstat (limited to 'node-admin')
2 files changed, 1 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 fed94442782..cc9c8c87272 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 @@ -110,15 +110,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(); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 161775b0702..ac1946c1fd8 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -293,6 +293,7 @@ public class NodeAgentImpl implements NodeAgent { // Even though memory can be easily changed with docker update, we need to restart the container // for proton to pick up the change. If/when proton could detect available memory correctly (rather than reading // VESPA_TOTAL_MEMORY_MB env. variable set in DockerOperation), it would be enough with a services restart + // TODO: Change to Vespa restart once all tenant applications are > 7.111 ContainerResources wantedContainerResources = getContainerResources(context); if (!wantedContainerResources.equalsMemory(existingContainer.resources)) { return Optional.of("Container should be running with different memory allocation, wanted: " + |