diff options
| author | hakonhall <hakon@yahoo-inc.com> | 2017-03-28 12:40:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 12:40:16 +0200 |
| commit | 722220fe05994f51b0d55b7a3aacd8f2d5cd5f33 (patch) | |
| tree | 696a74e327db89385fe6d5a1396798e482478aa0 /node-admin | |
| parent | b623b0b03d31ea652890d9fa6b0285e5ffc07d9e (diff) | |
| parent | 95b8abfaf80e31ce843e57d348f7fb8444a25a5f (diff) | |
Merge pull request #2089 from yahoo/freva/cpu-shares
Set CPU shares when starting a container
Diffstat (limited to 'node-admin')
2 files changed, 7 insertions, 0 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java index 90f1174f68e..6b51e56080f 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImpl.java @@ -178,6 +178,8 @@ public class DockerOperationsImpl implements DockerOperations { } } + nodeSpec.minCpuCores.ifPresent(cpuShares -> command.withCpuShares((int) Math.round(10 * cpuShares))); + logger.info("Starting new container with args: " + command); command.create(); diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java index 8c7eda50a24..bc3ce6ce5bb 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java @@ -182,6 +182,11 @@ public class DockerMock implements Docker { } @Override + public CreateContainerCommand withCpuShares(int shares) { + return this; + } + + @Override public CreateContainerCommand withNetworkMode(String mode) { return this; } |