diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-03-03 15:07:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-03 15:07:16 +0100 |
| commit | 3f86e311e1c3cdcf4ebfe80bc50271ad5f541ec6 (patch) | |
| tree | 9066702ebdce0ac90fc77407348123019ec8e362 | |
| parent | ce88aa9ee99369ad23c44b70b8c7740f945ccd4a (diff) | |
| parent | af6b5053cabc4c0aac6a4ee5cc12995ebfa56834 (diff) | |
Merge pull request #16762 from vespa-engine/hmusum/use-ower-heap-size-for-cluster-controller
Use 256 Mb as default max heap for cluster controllers
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 | ||||
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 53ecc5892b6..f5098cbfd12 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -85,7 +85,7 @@ public interface ModelContext { @ModelFeatureFlag(owners = {"musum", "mpolden"}, comment = "Revisit in February 2021") default boolean reconfigurableZookeeperServer() { return false; } @ModelFeatureFlag(owners = {"geirst"}) default boolean enableFeedBlockInDistributor() { return false; } @ModelFeatureFlag(owners = {"baldersheim", "geirst", "toregge"}) default double maxDeadBytesRatio() { return 0.2; } - @ModelFeatureFlag(owners = {"hmusum"}) default int clusterControllerMaxHeapSizeInMb() { return 512; } + @ModelFeatureFlag(owners = {"hmusum"}) default int clusterControllerMaxHeapSizeInMb() { return 256; } @ModelFeatureFlag(owners = {"hmusum"}) default int metricsProxyMaxHeapSizeInMb(ClusterSpec.Type type) { return 512; } @ModelFeatureFlag(owners = {"bjorncs", "tokle"}) default List<String> allowedAthenzProxyIdentities() { return List.of(); } @ModelFeatureFlag(owners = {"tokle"}) default boolean tenantIamRole() { return false; } diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index c9a4006667f..0b9b9e418bc 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -234,7 +234,7 @@ public class Flags { TENANT_ID, ZONE_ID); public static final UnboundIntFlag CLUSTER_CONTROLLER_MAX_HEAP_SIZE_IN_MB = defineIntFlag( - "cluster-controller-max-heap-size-in-mb", 512, + "cluster-controller-max-heap-size-in-mb", 256, List.of("hmusum"), "2021-02-10", "2021-04-10", "JVM max heap size for cluster controller in Mb", "Takes effect when restarting cluster controller"); |