diff options
Diffstat (limited to 'docker-api')
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java | 1 | ||||
| -rw-r--r-- | docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java | 1 |
2 files changed, 2 insertions, 0 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 febd3ba4d98..596b582b52b 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 @@ -162,6 +162,7 @@ class CreateContainerCommandImpl implements Docker.CreateContainerCommand { containerResources.ifPresent(cr -> hostConfig .withCpuShares(cr.cpuShares()) .withMemory(cr.memoryBytes()) + .withMemorySwap(cr.memoryBytes()) .withCpuPeriod(cr.cpuQuota() > 0 ? cr.cpuPeriod() : null) .withCpuQuota(cr.cpuQuota() > 0 ? cr.cpuQuota() : null)); 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 bafa11f2a06..1c2e6f44339 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 @@ -238,6 +238,7 @@ public class DockerImpl implements Docker { UpdateContainerCmd updateContainerCmd = dockerClient.updateContainerCmd(containerName.asString()) .withCpuShares(resources.cpuShares()) .withMemory(resources.memoryBytes()) + .withMemorySwap(resources.memoryBytes()) // Command line argument `--cpus c` is sent over to docker daemon as "NanoCPUs", which is the // value of `c * 1e9`. This however, is just a shorthand for `--cpu-period p` and `--cpu-quota q` |