diff options
author | Geir Storli <geirst@oath.com> | 2017-10-10 13:18:01 +0200 |
---|---|---|
committer | Geir Storli <geirst@oath.com> | 2017-10-16 12:54:18 +0200 |
commit | f2e221f80fc637914d5614c16cc72f679b282055 (patch) | |
tree | 8da92a68b386cf4accad6290e8bf9c7575d5367c /config-model | |
parent | 6ac5a9c0f069287422e617be88e36b3d769ba014 (diff) |
Set num cpu cores in proton config based on node flavor.
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java | 1 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java index 5f552f119c5..36988669415 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java @@ -36,6 +36,7 @@ public class NodeFlavorTuning implements ProtonConfig.Producer { private void setHwInfo(ProtonConfig.Builder builder) { builder.hwinfo.disk.size((long)nodeFlavor.getMinDiskAvailableGb() * GB); builder.hwinfo.memory.size((long)nodeFlavor.getMinMainMemoryAvailableGb() * GB); + builder.hwinfo.cpu.cores((int)nodeFlavor.getMinCpuCores()); } private void tuneDiskWriteSpeed(ProtonConfig.Builder builder) { diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java index 04ae3de3707..52d014e2630 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java @@ -28,6 +28,12 @@ public class NodeFlavorTuningTest { } @Test + public void require_that_hwinfo_cpu_cores_is_set() { + ProtonConfig cfg = configFromNumCoresSetting(24); + assertEquals(24, cfg.hwinfo().cpu().cores()); + } + + @Test public void require_that_fast_disk_is_reflected_in_proton_config() { ProtonConfig cfg = configFromDiskSetting(true); assertEquals(200, cfg.hwinfo().disk().writespeed(), 0.001); |