summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-02-11 07:18:28 +0100
committerGitHub <noreply@github.com>2021-02-11 07:18:28 +0100
commitab86947680c13a882b9f62db1ec852e40a313332 (patch)
tree94fc15fc326fccb8ef0abaaad1f3cf48512f7da5 /config-model-api
parentea2355efcef317ebfa71b49539f1a3a10d67d6d7 (diff)
parent65e57d5e52bc8189c120566c9bd67c1b71384b42 (diff)
Merge pull request #16464 from vespa-engine/hmusum/use-flag-to-control-max-heap-size-for-clustercontroller
Use feature flag for max heap size for cluster controller
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java8
1 files changed, 4 insertions, 4 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 c80656fadc6..0ac7770f4c2 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,6 +85,7 @@ public interface ModelContext {
@ModelFeatureFlag(owners = {"bjorncs", "tokle", "baldersheim"}, removeAfter = "7.357") default boolean enableZstdCompressionAccessLog() { return true; }
@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; }
}
/** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */
@@ -108,13 +109,12 @@ public interface ModelContext {
Optional<ApplicationRoles> applicationRoles();
- default Quota quota() {
- return Quota.unlimited();
- }
+ default Quota quota() { return Quota.unlimited(); }
/// Default setting for the gc-options attribute if not specified explicit by application
String jvmGCOptions();
- // TODO(somebody): Only needed for LbServicesProducerTest
+
+ // Note: Used in unit tests (set to false in TestProperties) to avoid needing to deal with implicitly created node for logserver
default boolean useDedicatedNodeForLogserver() { return true; }
}