Tune model by real resources not advertised

3 files changed, 13 insertions, 18 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 207e130eaaa..5207a0163cb 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
@@ -44,8 +44,8 @@ public final class ApplicationContainer extends Container implements
     @Override
     public void getConfig(QrStartConfig.Builder builder) {
         if (getHostResource() != null) {
-            if ( ! getHostResource().advertisedResources().isUnspecified()) {
-                NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().advertisedResources());
+            if ( ! getHostResource().realResources().isUnspecified()) {
+                NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().realResources());
                 flavorTuning.getConfig(builder);
             }
         }
@@ -79,13 +79,13 @@ public final class ApplicationContainer extends Container implements
     @Override
     public void getConfig(ThreadpoolConfig.Builder builder) {
         if (! (parent instanceof ContainerCluster)) return;
-        if ((getHostResource() == null) || getHostResource().advertisedResources().isUnspecified()) return;
+        if ((getHostResource() == null) || getHostResource().realResources().isUnspecified()) return;
         ContainerCluster containerCluster = (ContainerCluster) parent;
         if (containerCluster.getThreadPoolSizeFactor() <= 0.0) return;
 
-        NodeResourcesTuning flavorTuning = new NodeResourcesTuning(getHostResource().advertisedResources())
+        NodeResourcesTuning resourcesTuning = new NodeResourcesTuning(getHostResource().realResources())
                 .setThreadPoolSizeFactor(containerCluster.getThreadPoolSizeFactor())
                 .setQueueSizeFactor(containerCluster.getQueueSizeFactor());
-        flavorTuning.getConfig(builder);
+        resourcesTuning.getConfig(builder);
     }
 }
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 028aee369c3..f41188eccde 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
@@ -86,8 +86,8 @@ public class StorageNode extends ContentNode implements StorServerConfig.Produce
 
     @Override
     public void getConfig(StorFilestorConfig.Builder builder) {
-        if (getHostResource() != null && ! getHostResource().advertisedResources().isUnspecified()) {
-            builder.num_threads(Math.max(4, (int)getHostResource().advertisedResources().vcpu()));
+        if (getHostResource() != null && ! getHostResource().realResources().isUnspecified()) {
+            builder.num_threads(Math.max(4, (int)getHostResource().realResources().vcpu()));
         }
         cluster.getConfig(builder);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index f908d091a72..c1498936280 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -269,19 +269,14 @@ public class SearchNode extends AbstractService implements
             // to make sure the node failer has done its work
             builder.pruneremoveddocumentsage(4 * 24 * 3600 + 3600 + 60);
         }
-        if (getHostResource() != null && ! getHostResource().advertisedResources().isUnspecified()) {
-            NodeResourcesTuning nodeResourcesTuning = tuning.isPresent()
-                    ? new NodeResourcesTuning(getHostResource().advertisedResources(), redundancy, searchableCopies, tuning.get().getNumThreadsPerSearch())
-                    : new NodeResourcesTuning(getHostResource().advertisedResources(), redundancy, searchableCopies);
+        if (getHostResource() != null && ! getHostResource().realResources().isUnspecified()) {
+            var nodeResourcesTuning = tuning.isPresent()
+                    ? new NodeResourcesTuning(getHostResource().realResources(), redundancy, searchableCopies, tuning.get().getNumThreadsPerSearch())
+                    : new NodeResourcesTuning(getHostResource().realResources(), redundancy, searchableCopies);
             nodeResourcesTuning.getConfig(builder);
 
-            if (tuning.isPresent()) {
-                tuning.get().getConfig(builder);
-            }
-
-            if (resourceLimits.isPresent()) {
-                resourceLimits.get().getConfig(builder);
-            }
+            tuning.ifPresent(t -> t.getConfig(builder));
+            resourceLimits.ifPresent(l -> l.getConfig(builder));
         }
     }