Set num cpu cores in proton config based on node flavor.

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);