diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-01-14 20:16:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 20:16:39 +0100 |
| commit | c97ac2ea1f3b80c34064f6048e7f437654cc987b (patch) | |
| tree | 0cea2ca3af85bc3464d5f5770ae33ddf3e6122a7 | |
| parent | 1d84bb26b3d7d59987c18bf3c3a49203e749610c (diff) | |
| parent | 7ef56356cae32429ea94e7242b14cb9f54c06834 (diff) | |
Merge pull request #20817 from vespa-engine/balder/tighter-heap-control
Readuce minimum direct memory size from 75m to 16m
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/search.config.qr-start.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java index 474013c17fc..41c7f6d72e2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/ClusterControllerTestCase.java @@ -397,7 +397,7 @@ public class ClusterControllerTestCase extends DomBuilderTest { assertEquals("-XX:+UseG1GC -XX:MaxTenuringThreshold=15", qrStartConfig.jvm().gcopts()); assertEquals(512, qrStartConfig.jvm().stacksize()); assertEquals(0, qrStartConfig.jvm().directMemorySizeCache()); - assertEquals(75, qrStartConfig.jvm().baseMaxDirectMemorySize()); + assertEquals(16, qrStartConfig.jvm().baseMaxDirectMemorySize()); assertReindexingConfigPresent(model); assertReindexingConfiguredOnAdminCluster(model); diff --git a/container-search/src/main/resources/configdefinitions/search.config.qr-start.def b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def index e2856e137f0..c58f9944d61 100644 --- a/container-search/src/main/resources/configdefinitions/search.config.qr-start.def +++ b/container-search/src/main/resources/configdefinitions/search.config.qr-start.def @@ -24,7 +24,7 @@ jvm.stacksize int default=512 restart jvm.compressedClassSpaceSize int default=32 restart ## Base value of maximum direct memory size (in megabytes) -jvm.baseMaxDirectMemorySize int default=75 restart +jvm.baseMaxDirectMemorySize int default=16 restart ## Amount of direct memory used for caching. (in megabytes) jvm.directMemorySizeCache int default=0 restart |