Update tests and fix comment

2 files changed, 6 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
index 5a86ebfd7eb..531dc8f0fcf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java
@@ -212,7 +212,7 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat
             int heapSizePercentageOfAvailable = heapSizePercentageOfAvailable();
             if (getContainers().isEmpty()) return Optional.of(JvmMemoryPercentage.of(heapSizePercentageOfAvailable)); // Node memory is not known
 
-            // Node memory is known so convert available memory ofContainerAvailable to node memory ofContainerAvailable
+            // Node memory is known, so compute heap size as a percentage of available memory (excluding overhead, which the startup scripts also account for)
             double totalMemoryGb = getContainers().stream().mapToDouble(c -> c.getHostResource().realResources().memoryGb()).min().orElseThrow();
             double totalMemoryMinusOverhead = Math.max(0, totalMemoryGb - Host.memoryOverheadGb);
             double onnxModelCostGb = onnxModelCostCalculator.aggregatedModelCostInBytes() / (1024D * 1024 * 1024);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
index 4c0786ea879..484a938476d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/RestartOnDeployForOnnxModelChangesValidatorTest.java
@@ -33,7 +33,7 @@ public class RestartOnDeployForOnnxModelChangesValidatorTest {
 
     // Must be so large that changing model set or options requires restart (due to using more memory than available),
     // but not so large that deployment will not work at all with one model
-    private static final long defaultCost = 723456789;
+    private static final long defaultCost = 635241309;
     private static final long defaultHash = 0;
 
 
@@ -47,8 +47,8 @@ public class RestartOnDeployForOnnxModelChangesValidatorTest {
 
     @Test
     void validate_changed_estimated_cost() {
-        VespaModel current = createModel(onnxModelCost(70000000, defaultHash));
-        VespaModel next = createModel(onnxModelCost(723456789, defaultHash));
+        VespaModel current = createModel(onnxModelCost(defaultCost, defaultHash));
+        VespaModel next = createModel(onnxModelCost(19 * defaultCost / 20, defaultHash));
         List<ConfigChangeAction> result = validateModel(current, next);
         assertEquals(1, result.size());
         assertTrue(result.get(0).validationId().isEmpty());
@@ -58,8 +58,8 @@ public class RestartOnDeployForOnnxModelChangesValidatorTest {
     @Test
     void validate_changed_estimated_cost_non_hosted() {
         boolean hosted = false;
-        VespaModel current = createModel(onnxModelCost(70000000, defaultHash), hosted);
-        VespaModel next = createModel(onnxModelCost(723456789, defaultHash), hosted);
+        VespaModel current = createModel(onnxModelCost(defaultCost, defaultHash), hosted);
+        VespaModel next = createModel(onnxModelCost(19 * defaultCost / 20, defaultHash), hosted);
         List<ConfigChangeAction> result = validateModel(current, next, hosted);
         assertEquals(0, result.size());
     }