diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-04 14:37:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-04 14:37:05 +0100 |
| commit | e4eabf71e947af535a7f3bd868939e2f115a30bf (patch) | |
| tree | c9b205cc41e3a0878e1d3670874ab4c512a5f6b7 /config-model | |
| parent | 6db2e1194c4e737340de486feee4ee6482033b99 (diff) | |
| parent | 5ef65df58ed536c271e410df0543ccab80eba801 (diff) | |
Merge pull request #16793 from vespa-engine/hmusum/reduce-max-heap-size-for-non-application-containers
Change default max heap size for non-application containers
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java | 2 | ||||
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java index a95e924cb57..c78d54e6eff 100644 --- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java +++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java @@ -56,7 +56,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea private boolean enableFeedBlockInDistributor = false; private double maxDeadBytesRatio = 0.2; private int clusterControllerMaxHeapSizeInMb = 256; - private int metricsProxyMaxHeapSizeInMb = 512; + private int metricsProxyMaxHeapSizeInMb = 256; private int maxActivationInhibitedOutOfSyncGroups = 0; @Override public ModelContext.FeatureFlags featureFlags() { return this; } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index a1db3c43f1c..db4cda8b72e 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -487,7 +487,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> .availableProcessors(2) .compressedClassSpaceSize(32) .minHeapsize(32) - .heapsize(512) + .heapsize(256) .heapSizeAsPercentageOfPhysicalMemory(0) .gcopts(Objects.requireNonNullElse(jvmGCOptions, G1GC)); if (environmentVars != null) { |