aboutsummaryrefslogtreecommitdiffstats
path: root/docker-api
diff options
context:
space:
mode:
Diffstat (limited to 'docker-api')
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerResources.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerResources.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerResources.java
index b8f9cd55f29..64d8fd6a1e8 100644
--- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerResources.java
+++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/ContainerResources.java
@@ -47,8 +47,10 @@ public class ContainerResources {
return cpus;
}
+ // Although docker allows to update cpu quota to 0, this is not a legal value, must be set -1 for unlimited
+ // See: https://github.com/docker/for-linux/issues/558
public int cpuQuota() {
- return (int) (cpus * CPU_PERIOD);
+ return cpus > 0 ? (int) (cpus * CPU_PERIOD) : -1;
}
public int cpuPeriod() {