summaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2019-09-24 09:19:24 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2019-09-24 09:19:24 +0200
commit076a11763e1002a8881025ae42e068d92c7ec9f2 (patch)
tree311183a01c9f6aae6aead4bb527a2536d247401d /docker-api
parente6b83c91b64229920749de1b790cc536d903b1fb (diff)
Use -1L to set max
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
index 3de360a398b..343f21540a2 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java
@@ -170,10 +170,9 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand {
.withSecurityOpts(new ArrayList<>(securityOpts))
.withBinds(volumeBinds)
.withUlimits(ulimits)
- // At docker version 1.13.1 patch 91 and earlier, pids.max for the Docker container's cgroup
- // was "max". This changed to patch 102, with a default of 4k which is too low. Note: Setting
- // this to 0L still results in 4k. File: /sys/fs/cgroup/pids/docker/CONTAINERID/pids.max.
- .withPidsLimit(409600L)
+ // Docker version 1.13.1 patch 94 changed default pids.max for the Docker container's cgroup
+ // from max to 4096. -1L reinstates "max". File: /sys/fs/cgroup/pids/docker/CONTAINERID/pids.max.
+ .withPidsLimit(-1L)
.withCapAdd(addCapabilities.toArray(new Capability[0]))
.withCapDrop(dropCapabilities.toArray(new Capability[0]))
.withPrivileged(privileged);