diff options
| author | Valerij Fredriksen <valerijf@oath.com> | 2019-01-15 14:08:12 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@oath.com> | 2019-01-15 14:08:22 +0100 |
| commit | 5c4e2de4728c75a6787013bd2f0e91d3c1f71f5c (patch) | |
| tree | 4a731e648c11fb58484643e450ca643cc87d675e /docker-api | |
| parent | 6091195d8c5fe2d55f2264d7bc43687f615f1d54 (diff) | |
Always set period and quota when updating container
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |