aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2019-01-15 17:07:35 +0100
committerValerij Fredriksen <valerijf@oath.com>2019-01-15 17:07:35 +0100
commit3fb9f2e30f3b51b745e63d3e08f840e440e74efa (patch)
tree19ce3adf6863402e51d4dc204df70daea4ac2a6d
parent7773b34a55b64094ed7cd52e554c233d8bfcc155 (diff)
Disable memory swap
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/CreateContainerCommandImpl.java1
-rw-r--r--docker-api/src/main/java/com/yahoo/vespa/hosted/dockerapi/DockerImpl.java1
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`