diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-06 09:00:09 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-06 09:00:09 +0100 |
| commit | c63608db287878a831af237612918cafd0c600e3 (patch) | |
| tree | cc06714ff8844e5b14bc7f3d7804aa89391bb4ac /config-model | |
| parent | 99defb946229477e4929682ba5f8701c77a2aa77 (diff) | |
Use minCpuCores where we care about the number, not the performance
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java index b300dcfe85e..67938b36fd9 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java @@ -19,7 +19,7 @@ public class NodeFlavorTuning implements QrStartConfig.Producer { @Override public void getConfig(QrStartConfig.Builder builder) { - builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.resources().vcpu()))); + builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.getMinCpuCores()))); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java index 8c3dce4d968..c8220071373 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageNode.java @@ -88,7 +88,7 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce public void getConfig(StorFilestorConfig.Builder builder) { if (getHostResource() != null && getHostResource().getFlavor().isPresent()) { Flavor nodeFlavor = getHostResource().getFlavor().get(); - builder.num_threads(Math.max(4, (int)nodeFlavor.resources().vcpu())); + builder.num_threads(Math.max(4, (int)nodeFlavor.getMinCpuCores())); } cluster.getConfig(builder); } 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 64bb4e964f0..c337c77d2a2 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 @@ -57,7 +57,7 @@ public class NodeFlavorTuning implements ProtonConfig.Producer { private void setHwInfo(ProtonConfig.Builder builder) { builder.hwinfo.disk.shared(nodeFlavor.getType().equals(Flavor.Type.DOCKER_CONTAINER)); - builder.hwinfo.cpu.cores((int)nodeFlavor.resources().vcpu()); + builder.hwinfo.cpu.cores((int)nodeFlavor.getMinCpuCores()); builder.hwinfo.memory.size((long)nodeFlavor.resources().memoryGb() * GB); builder.hwinfo.disk.size((long)nodeFlavor.resources().diskGb() * GB); } |