diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-11-29 12:38:17 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-11-29 12:38:17 +0100 |
commit | f7feaef87bf1f8ccae3b3c9cb84de8ab94e1e4f2 (patch) | |
tree | 4b5d5bff3516dd6858a77a6f62ac279c31db2778 /node-admin/src/main | |
parent | 6d9956a0735f3cea2addf266ad2769f52ab46b83 (diff) |
Revert "Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations""
This reverts commit 84176f9
Diffstat (limited to 'node-admin/src/main')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 8 |
1 files changed, 1 insertions, 7 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 b40718ac7be..d6b370c4ec2 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 @@ -46,14 +46,11 @@ public class DockerOperationsImpl implements DockerOperations { private final Docker docker; private final ProcessExecuter processExecuter; - private final List<String> configServerHostnames; private final IPAddresses ipAddresses; - public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter, - List<String> configServerHostnames, IPAddresses ipAddresses) { + public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter, IPAddresses ipAddresses) { this.docker = docker; this.processExecuter = processExecuter; - this.configServerHostnames = configServerHostnames; this.ipAddresses = ipAddresses; } @@ -66,15 +63,12 @@ public class DockerOperationsImpl implements DockerOperations { () -> new RuntimeException("Unable to find a valid IPv6 address for " + node.getHostname() + ". Missing an AAAA DNS entry?")); - String configServers = String.join(",", configServerHostnames); - Docker.CreateContainerCommand command = docker.createContainerCommand( node.getWantedDockerImage().get(), ContainerResources.from(node.getMinCpuCores(), node.getMinMainMemoryAvailableGb()), context.containerName(), node.getHostname()) .withManagedBy(MANAGER_NAME) - .withEnvironment("VESPA_CONFIGSERVERS", configServers) .withUlimit("nofile", 262_144, 262_144) // The nproc aka RLIMIT_NPROC resource limit works as follows: // - A process has a (soft) nproc limit, either inherited by the parent or changed with setrlimit(2). |