diff options
| author | valerijf <valerijf@yahoo-inc.com> | 2017-03-28 11:13:24 +0200 |
|---|---|---|
| committer | valerijf <valerijf@yahoo-inc.com> | 2017-03-28 12:34:13 +0200 |
| commit | 95b8abfaf80e31ce843e57d348f7fb8444a25a5f (patch) | |
| tree | 775d4dc4d550288c2e61e14581c1be38512a0fa2 /node-admin | |
| parent | 5de34d52481b6bb289f0775d087dcef82c20f350 (diff) | |
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; } |