diff options
author | freva <valerijf@yahoo-inc.com> | 2017-01-04 12:18:34 +0100 |
---|---|---|
committer | freva <valerijf@yahoo-inc.com> | 2017-01-04 12:18:34 +0100 |
commit | 2f7dd9bcebb8ede056f6bef857e47a80f0b84f1a (patch) | |
tree | c06bbbbc902c10ccabd7d6207b4ae9f76577ae69 | |
parent | 152d79287715bc8c0c6e21cd2494386ba2d9c4a3 (diff) |
Add VESPA_TOTAL_MEMORY_MB enviroment variable
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 5 |
1 files changed, 5 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 07e44a58f44..985345f4196 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 @@ -219,6 +219,7 @@ public class DockerOperationsImpl implements DockerOperations { // 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`). command.withEnvironment("TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb)); + command.withEnvironment("VESPA_TOTAL_MEMORY_MB", Long.toString(minMainMemoryAvailableMb)); } } @@ -240,6 +241,10 @@ public class DockerOperationsImpl implements DockerOperations { } } + /** + * Due to a bug in docker (https://github.com/docker/libnetwork/issues/1443), we need to manually set + * IPv6 gateway in containers connected to more than one docker network + */ private void setupContainerNetworkingWithScript(ContainerName containerName) { PrefixLogger logger = PrefixLogger.getNodeAgentLogger(DockerOperationsImpl.class, containerName); |