Add a test that heap size percentage override is taken into account when allowing memory for proton.

1 files changed, 37 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 171958f2bfa..912161019fe 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -278,6 +278,43 @@ public class ModelProvisioningTest {
         }
     }
 
+    @Test
+    public void testCombinedClusterWithJvmHeapSizeOverride() {
+        var containerElements = Set.of("jdisc", "container");
+        for (var containerElement : containerElements) {
+            String xmlWithNodes =
+                    "<?xml version='1.0' encoding='utf-8' ?>" +
+                            "<services>" +
+                            "  <" + containerElement + " version='1.0' id='container1'>" +
+                            "     <search/>" +
+                            "     <nodes of='content1'>" +
+                            "      <jvm allocated-memory=\"30%\"/>" +
+                            "     </nodes>" +
+                            "  </" + containerElement + ">" +
+                            "  <content version='1.0' id='content1'>" +
+                            "     <redundancy>2</redundancy>" +
+                            "     <documents>" +
+                            "       <document type='type1' mode='index'/>" +
+                            "     </documents>" +
+                            "     <nodes count='2'>" +
+                            "       <resources vcpu='1' memory='3Gb' disk='9Gb'/>" +
+                            "     </nodes>" +
+                            "   </content>" +
+                            "</services>";
+            VespaModelTester tester = new VespaModelTester();
+            tester.addHosts(5);
+            VespaModel model = tester.createModel(xmlWithNodes, true);
+            assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size());
+            assertEquals("Nodes in container1", 2, model.getContainerClusters().get("container1").getContainers().size());
+            assertEquals("Heap size is lowered with combined clusters",
+                    30, physicalMemoryPercentage(model.getContainerClusters().get("container1")));
+            assertEquals("Memory for proton is lowered to account for the jvm heap",
+                    (long)((3 - reservedMemoryGb) * (Math.pow(1024, 3)) * (1 - 0.30)), protonMemorySize(model.getContentClusters().get("content1")));
+            assertProvisioned(0, ClusterSpec.Id.from("container1"), ClusterSpec.Type.container, model);
+            assertProvisioned(2, ClusterSpec.Id.from("content1"), ClusterSpec.Id.from("container1"), ClusterSpec.Type.combined, model);
+        }
+    }
+
     /** For comparison with the above */
     @Test
     public void testNonCombinedCluster() {