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/ApplicationContainer.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/ApplicationContainer.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index e59baf88422..7fe6e97397a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -3,7 +3,6 @@ package com.yahoo.vespa.model.container; import com.yahoo.config.model.api.container.ContainerServiceType; import com.yahoo.config.model.producer.AbstractConfigProducer; -import com.yahoo.config.provision.Flavor; import com.yahoo.container.bundle.BundleInstantiationSpecification; import com.yahoo.osgi.provider.model.ComponentModel; import com.yahoo.prelude.fastsearch.FS4ResourcePool; @@ -40,9 +39,12 @@ public final class ApplicationContainer extends Container implements QrStartConf @Override public void getConfig(QrStartConfig.Builder builder) { - if (getHostResource() != null) { + ApplicationContainerCluster cluster = (ApplicationContainerCluster) getParent(); + if (isHostedVespa && getHostResource() != null) { if (getHostResource().getFlavor().isPresent()) { - NodeFlavorTuning flavorTuning = new NodeFlavorTuning(getHostResource().getFlavor().get()); + boolean isCombinedCluster = cluster.getHostClusterId().isPresent(); + NodeFlavorTuning flavorTuning = new NodeFlavorTuning(getHostResource().getFlavor().get(), + cluster.getMemoryPercentage().orElse(isCombinedCluster ? 17 : 60)); flavorTuning.getConfig(builder); } } |