diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-22 15:17:21 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-22 15:17:21 +0200 |
commit | 4d989dd30a3d9e4f0f672a7ec4925290dc28e98a (patch) | |
tree | c1ad39f8bd718d0895290e9101afc15c792bc358 /config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java | |
parent | 7450dd228ec177306a6702f583b616481e33435b (diff) |
Access resources directly
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 | 9 |
1 files changed, 4 insertions, 5 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 29bb578a67b..207e130eaaa 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.container.handler.ThreadpoolConfig; import com.yahoo.osgi.provider.model.ComponentModel; @@ -45,8 +44,8 @@ public final class ApplicationContainer extends Container implements @Override public void getConfig(QrStartConfig.Builder builder) { if (getHostResource() != null) { - if (getHostResource().getFlavor().isPresent()) { - NodeFlavorTuning flavorTuning = new NodeFlavorTuning(getHostResource().getFlavor().get()); + if ( ! getHostResource().advertisedResources().isUnspecified()) { + NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().advertisedResources()); flavorTuning.getConfig(builder); } } @@ -80,11 +79,11 @@ public final class ApplicationContainer extends Container implements @Override public void getConfig(ThreadpoolConfig.Builder builder) { if (! (parent instanceof ContainerCluster)) return; - if ((getHostResource() == null) || getHostResource().getFlavor().isEmpty()) return; + if ((getHostResource() == null) || getHostResource().advertisedResources().isUnspecified()) return; ContainerCluster containerCluster = (ContainerCluster) parent; if (containerCluster.getThreadPoolSizeFactor() <= 0.0) return; - NodeFlavorTuning flavorTuning = new NodeFlavorTuning(getHostResource().getFlavor().get()) + NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().advertisedResources()) .setThreadPoolSizeFactor(containerCluster.getThreadPoolSizeFactor()) .setQueueSizeFactor(containerCluster.getQueueSizeFactor()); flavorTuning.getConfig(builder); |