diff options
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java | 4 |
2 files changed, 6 insertions, 2 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 077b97d82c0..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 @@ -10,12 +10,16 @@ import com.yahoo.search.config.QrStartConfig; * @author balder */ public class NodeFlavorTuning implements QrStartConfig.Producer { + private final Flavor flavor; + NodeFlavorTuning(Flavor flavor) { this.flavor = flavor; } + @Override public void getConfig(QrStartConfig.Builder builder) { builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.getMinCpuCores()))); } + } 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 3260cf3a680..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 @@ -56,10 +56,10 @@ public class NodeFlavorTuning implements ProtonConfig.Producer { } private void setHwInfo(ProtonConfig.Builder builder) { - builder.hwinfo.disk.size((long)nodeFlavor.getMinDiskAvailableGb() * GB); builder.hwinfo.disk.shared(nodeFlavor.getType().equals(Flavor.Type.DOCKER_CONTAINER)); - builder.hwinfo.memory.size((long)nodeFlavor.getMinMainMemoryAvailableGb() * GB); 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); } private void tuneDiskWriteSpeed(ProtonConfig.Builder builder) { |