From f7feaef87bf1f8ccae3b3c9cb84de8ab94e1e4f2 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Thu, 29 Nov 2018 12:38:17 +0100 Subject: Revert "Revert "Do not set VESPA_CONFIGSERVERS in DockerOperations"" This reverts commit 84176f9 --- .../vespa/hosted/node/admin/docker/DockerOperationsImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'node-admin/src/main') 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 configServerHostnames; private final IPAddresses ipAddresses; - public DockerOperationsImpl(Docker docker, ProcessExecuter processExecuter, - List 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). -- cgit v1.2.3