diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-03-31 13:44:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-31 13:44:15 +0200 |
| commit | c59de615fe277e98d1540f17bdb554edf10375ab (patch) | |
| tree | bd4add8afd20af2a9a42803d433e45b825be293b /config-model | |
| parent | 64172ddbe995373be72aad4be8258db96137dc39 (diff) | |
| parent | e63224df94bf3c5bf39376aa79da4f4e219d1ae6 (diff) | |
Merge pull request #2119 from yahoo/hmusum/increase-heap-size-for-container
Increase heap size for JVM for container
Diffstat (limited to 'config-model')
3 files changed, 4 insertions, 5 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java index 29ea3aeb7c9..8e2a8bd74b1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java @@ -130,8 +130,8 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains> if (owningCluster.getHostClusterId().isPresent()) internalBuilder.heapSizeAsPercentageOfPhysicalMemory(17); else - internalBuilder.heapSizeAsPercentageOfPhysicalMemory(33); - } + internalBuilder.heapSizeAsPercentageOfPhysicalMemory(60); + } qsB.jvm(internalBuilder.directMemorySizeCache(totalCacheSizeMb())); } 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 a6fdf2b6bc9..7d1d5c7c75b 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 @@ -176,8 +176,7 @@ public class ModelProvisioningTest { assertEquals("Nodes in content1", 2, model.getContentClusters().get("content1").getRootGroup().getNodes().size()); assertEquals("Nodes in container1", 1, model.getContainerClusters().get("container1").getContainers().size()); - assertEquals("Heap size is lowered with combined clusters", - 33, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); + assertEquals("Heap size for container", 60, physicalMemoryPercentage(model.getContainerClusters().get("container1"))); } @Test diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java index 6c9d9d575f8..bdd203236f9 100755 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java @@ -110,7 +110,7 @@ public class ContainerClusterTest { public void requireThatHeapSizeAsPercentageOfPhysicalMemoryForHostedAndNot() { boolean hosted = true; boolean combined = true; // a cluster running on content nodes (only relevant with hosted) - verifyHeapSizeAsPercentageOfPhysicalMemory( hosted, ! combined, Optional.empty(), 33); + verifyHeapSizeAsPercentageOfPhysicalMemory( hosted, ! combined, Optional.empty(), 60); verifyHeapSizeAsPercentageOfPhysicalMemory( hosted, combined, Optional.empty(), 17); verifyHeapSizeAsPercentageOfPhysicalMemory(! hosted, ! combined, Optional.empty(), 0); |