diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-05-24 15:23:51 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-05-24 15:23:51 +0200 |
commit | 43eb83f3c4625d77ffe4b3cb6f1ca3b03ca22069 (patch) | |
tree | ced1ba6193ebb01b0f810d9ad88caf67bbd020a5 /node-admin | |
parent | f4f86814c95b08824a11ff4a872332dc7d88e91d (diff) |
Nonfunctional changes only
Diffstat (limited to 'node-admin')
-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 c8e280c0c78..6dfcf3e9aec 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 @@ -60,7 +60,7 @@ public class DockerOperationsImpl implements DockerOperations { // IPv6 - Assume always valid Inet6Address ipV6Address = ipAddresses.getIPv6Address(context.node().getHostname()).orElseThrow( () -> new RuntimeException("Unable to find a valid IPv6 address for " + context.node().getHostname() + - ". Missing an AAAA DNS entry?")); + ". Missing an AAAA DNS entry?")); Docker.CreateContainerCommand command = docker.createContainerCommand( context.node().getWantedDockerImage().get(), context.containerName()) @@ -76,12 +76,6 @@ public class DockerOperationsImpl implements DockerOperations { // // From experience our Vespa processes require a high limit, say 400k. For all other processes, // we would like to use a much lower limit, say 32k. - // - // Unfortunately, the Vespa processes runs as the yahoo user which is also used by many non-Vespa - // processes. This means all yahoo users must use the high limit. For instance, yinst would start - // many yahoo processes along with root processes and other processes. It's non-trivial to get this - // exactly right. Instead and for now, we just set a high limit here which will apply to all processes - // in the container, unless explicitly modified. .withUlimit("nproc", 409_600, 409_600) .withUlimit("core", -1, -1) .withAddCapability("SYS_PTRACE") // Needed for gcore, pstack etc. |