Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 10 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidator.java
index f87cecb58fe..425a662bb2d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidator.java
@@ -1,8 +1,9 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 package com.yahoo.vespa.model.application.validation;
 
 import com.yahoo.config.model.deploy.DeployState;
+import com.yahoo.text.Text;
 import com.yahoo.vespa.model.VespaModel;
 
 import java.util.logging.Level;
@@ -32,21 +33,20 @@ public class JvmHeapSizeValidator extends Validator {
                 double gbLimit = 0.6;
                 double availableMemoryGb = mp.availableMemoryGb().getAsDouble();
                 double modelCostGb = jvmModelCost / (1024D * 1024 * 1024);
-                ds.getDeployLogger().log(Level.FINE, () -> "JVM: %d%% (limit: %d%%), %.2fGB (limit: %.2fGB), ONNX: %.2fGB"
-                        .formatted(mp.percentage(), percentLimit, availableMemoryGb, gbLimit, modelCostGb));
+                ds.getDeployLogger().log(Level.FINE, () -> Text.format("JVM: %d%% (limit: %d%%), %.2fGB (limit: %.2fGB), ONNX: %.2fGB",
+                        mp.percentage(), percentLimit, availableMemoryGb, gbLimit, modelCostGb));
                 if (mp.percentage() < percentLimit) {
-                    throw new IllegalArgumentException(
-                            ("Allocated percentage of memory of JVM in cluster '%s' is too low (%d%% < %d%%). " +
+                    throw new IllegalArgumentException(Text.format("Allocated percentage of memory of JVM in cluster '%s' is too low (%d%% < %d%%). " +
                                     "Estimated cost of ONNX models is %.2fGB. Either use a node flavor with more memory or use less expensive models. " +
-                                    "You may override this validation by specifying 'allocated-memory' (https://docs.vespa.ai/en/performance/container-tuning.html#jvm-heap-size).")
-                                            .formatted(clusterId, mp.percentage(), percentLimit, modelCostGb));
+                                    "You may override this validation by specifying 'allocated-memory' (https://docs.vespa.ai/en/performance/container-tuning.html#jvm-heap-size).",
+                            clusterId, mp.percentage(), percentLimit, modelCostGb));
                 }
                 if (availableMemoryGb < gbLimit) {
                     throw new IllegalArgumentException(
-                            ("Allocated memory to JVM in cluster '%s' is too low (%.2fGB < %.2fGB). " +
+                            Text.format("Allocated memory to JVM in cluster '%s' is too low (%.2fGB < %.2fGB). " +
                                     "Estimated cost of ONNX models is %.2fGB. Either use a node flavor with more memory or use less expensive models. " +
-                                    "You may override this validation by specifying 'allocated-memory' (https://docs.vespa.ai/en/performance/container-tuning.html#jvm-heap-size).")
-                                            .formatted(clusterId, availableMemoryGb, gbLimit, modelCostGb));
+                                    "You may override this validation by specifying 'allocated-memory' (https://docs.vespa.ai/en/performance/container-tuning.html#jvm-heap-size).",
+                                            clusterId, availableMemoryGb, gbLimit, modelCostGb));
                 }
             }
         });