diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-15 16:05:07 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-12-02 22:34:12 +0100 |
commit | 8e3f41c080e907cea27b58df869c9e127efdc078 (patch) | |
tree | a1fa8ebd4581881680eaf7b7532613e1107a97fa /config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java | |
parent | 610dcc8a32847c0b017e55319f2c5977004c198f (diff) |
In a hosted setting where flavour is available we now always compute absolute heap sizes.balder/hosted-always-convert-percentages-in-config-model
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/NodeFlavorTuning.java | 8 |
1 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 67938b36fd9..381e0bb47f1 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 @@ -12,14 +12,18 @@ import com.yahoo.search.config.QrStartConfig; public class NodeFlavorTuning implements QrStartConfig.Producer { private final Flavor flavor; - - NodeFlavorTuning(Flavor flavor) { + private final double memoryFraction; + NodeFlavorTuning(Flavor flavor, double memoryPercentage) { this.flavor = flavor; + this.memoryFraction = memoryPercentage / 100; } @Override public void getConfig(QrStartConfig.Builder builder) { builder.jvm.availableProcessors(Math.max(2, (int)Math.ceil(flavor.getMinCpuCores()))); + int heapSize = (int)(memoryFraction*flavor.getMinMainMemoryAvailableGb()*1000); + builder.jvm.minHeapsize(heapSize).heapsize(heapSize); + builder.jvm.heapSizeAsPercentageOfPhysicalMemory(0); } } |