Merge pull request #17931 from vespa-engine/hmusum/warn-when-specifying-resource-limits-in-hosted

Warn when specifying resource limits in hosted Vespa

3 files changed, 31 insertions, 16 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterResourceLimits.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterResourceLimits.java
index c7d56c9b4b5..70f2acd3c7b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterResourceLimits.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ClusterResourceLimits.java
@@ -1,6 +1,7 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import com.yahoo.vespa.model.content.cluster.DomResourceLimitsBuilder;
 
@@ -35,28 +36,31 @@ public class ClusterResourceLimits {
     public static class Builder {
 
         private final boolean enableFeedBlockInDistributor;
+        private final boolean hostedVespa;
+        private final DeployLogger deployLogger;
         private ResourceLimits.Builder ctrlBuilder = new ResourceLimits.Builder();
         private ResourceLimits.Builder nodeBuilder = new ResourceLimits.Builder();
 
-        public Builder(boolean enableFeedBlockInDistributor) {
+        public Builder(boolean enableFeedBlockInDistributor, boolean hostedVespa, DeployLogger deployLogger) {
             this.enableFeedBlockInDistributor = enableFeedBlockInDistributor;
+            this.hostedVespa = hostedVespa;
+            this.deployLogger = deployLogger;
         }
 
         public ClusterResourceLimits build(ModelElement clusterElem) {
-            ModelElement tuningElem = clusterElem.childByPath("tuning");
-            if (tuningElem != null) {
-                ctrlBuilder = DomResourceLimitsBuilder.createBuilder(tuningElem);
-            }
-
-            ModelElement protonElem = clusterElem.childByPath("engine.proton");
-            if (protonElem != null) {
-                nodeBuilder = DomResourceLimitsBuilder.createBuilder(protonElem);
-            }
+            ctrlBuilder = createBuilder(clusterElem.childByPath("tuning"));
+            nodeBuilder = createBuilder(clusterElem.childByPath("engine.proton"));
 
             deriveLimits();
             return new ClusterResourceLimits(this);
         }
 
+        private ResourceLimits.Builder createBuilder(ModelElement element) {
+            return element == null
+                    ? new ResourceLimits.Builder()
+                    : DomResourceLimitsBuilder.createBuilder(element, hostedVespa, deployLogger);
+        }
+
         public void setClusterControllerBuilder(ResourceLimits.Builder builder) {
             ctrlBuilder = builder;
         }
@@ -88,7 +92,7 @@ public class ClusterResourceLimits {
                                                                   Optional<Double> contentNodeLimit,
                                                                   Consumer<Double> setter) {
             // TODO: remove this when feed block in distributor is default enabled.
-            if (!clusterControllerLimit.isPresent() && !contentNodeLimit.isPresent()) {
+            if (clusterControllerLimit.isEmpty() && contentNodeLimit.isEmpty()) {
                 setter.accept(0.8);
             }
         }
@@ -96,7 +100,7 @@ public class ClusterResourceLimits {
         private void deriveClusterControllerLimit(Optional<Double> clusterControllerLimit,
                                                   Optional<Double> contentNodeLimit,
                                                   Consumer<Double> setter) {
-            if (!clusterControllerLimit.isPresent()) {
+            if (clusterControllerLimit.isEmpty()) {
                 contentNodeLimit.ifPresent(limit ->
                         // TODO: emit warning when feed block in distributor is default enabled.
                         setter.accept(Double.max(0.0, (limit - 0.01))));
@@ -106,7 +110,7 @@ public class ClusterResourceLimits {
         private void deriveContentNodeLimit(Optional<Double> contentNodeLimit,
                                             Optional<Double> clusterControllerLimit,
                                             Consumer<Double> setter) {
-            if (!contentNodeLimit.isPresent()) {
+            if (contentNodeLimit.isEmpty()) {
                 clusterControllerLimit.ifPresent(limit ->
                         setter.accept(calcContentNodeLimit(limit)));
             }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index f6a45842bd9..b9ee973664e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -134,7 +134,10 @@ public class ContentCluster extends AbstractConfigProducer implements
                                                   globallyDistributedDocuments, routingSelection,
                                                   deployState.zone(), deployState.isHosted());
             boolean enableFeedBlockInDistributor = deployState.getProperties().featureFlags().enableFeedBlockInDistributor();
-            var resourceLimits = new ClusterResourceLimits.Builder(enableFeedBlockInDistributor).build(contentElement);
+            var resourceLimits = new ClusterResourceLimits.Builder(enableFeedBlockInDistributor,
+                                                                   stateIsHosted(deployState),
+                                                                   deployState.getDeployLogger())
+                    .build(contentElement);
             c.clusterControllerConfig = new ClusterControllerConfig.Builder(getClusterId(contentElement),
                     contentElement,
                     resourceLimits.getClusterControllerLimits()).build(deployState, c, contentElement.getXml());
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
index 210f062f9b2..7640f1d737e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomResourceLimitsBuilder.java
@@ -1,9 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content.cluster;
 
+import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.vespa.model.builder.xml.dom.ModelElement;
 import com.yahoo.vespa.model.content.ResourceLimits;
 
+import java.util.logging.Level;
+
 /**
  * Builder for feed block resource limits.
  *
@@ -11,10 +14,15 @@ import com.yahoo.vespa.model.content.ResourceLimits;
  */
 public class DomResourceLimitsBuilder {
 
-    public static ResourceLimits.Builder createBuilder(ModelElement contentXml) {
+    public static ResourceLimits.Builder createBuilder(ModelElement contentXml, boolean hostedVespa, DeployLogger deployLogger) {
         ResourceLimits.Builder builder = new ResourceLimits.Builder();
         ModelElement resourceLimits = contentXml.child("resource-limits");
-        if (resourceLimits == null) {
+        if (resourceLimits == null) { return builder; }
+
+        if (hostedVespa) {
+            deployLogger.log(Level.WARNING, "Element " + resourceLimits + " is not allowed, default limits will be used");
+            // TODO: Throw exception when we are sure nobody is using this
+            //throw new IllegalArgumentException("Element " + element + " is not allowed to be set, default limits will be used");
             return builder;
         }
         if (resourceLimits.child("disk") != null) {