From 5c4e2de4728c75a6787013bd2f0e91d3c1f71f5c Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Tue, 15 Jan 2019 14:08:12 +0100 Subject: Always set period and quota when updating container --- .../src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker-api/src/main') diff --git a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java index 1d0295ebc68..3504d789333 100644 --- a/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java +++ b/docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java @@ -246,8 +246,8 @@ public class DockerImpl implements Docker { // --cpus requires API 1.25+ on create and 1.29+ on update // NanoCPUs is supported in docker-java as of 3.1.0 on create and not at all on update // TODO: Simplify this to .withNanoCPUs(resources.cpu()) when docker-java supports it - .withCpuPeriod(resources.cpuQuota() > 0 ? resources.cpuPeriod() : null) - .withCpuQuota(resources.cpuQuota() > 0 ? resources.cpuQuota() : null); + .withCpuPeriod(resources.cpuPeriod()) + .withCpuQuota(resources.cpuQuota()); updateContainerCmd.exec(); } catch (NotFoundException e) { -- cgit v1.2.3