aboutsummaryrefslogtreecommitdiffstats
path: root/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@vespa.ai>2023-11-03 14:14:20 +0100
committerTor Brede Vekterli <vekterli@vespa.ai>2023-11-03 14:16:30 +0100
commit3a4010e278b0ca3418d9a4b08c1978ab420953c4 (patch)
tree2386e531e78bc04e6d602d61d07b27129ec3c382 /config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
parent96f6abe9caa338074ee39cb2fd566d3efff464c9 (diff)
Add feature flag for controlling memory limits for merge operations
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java1
1 files changed, 1 insertions, 0 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 3fd5af98f04..833e2f020bc 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
@@ -117,6 +117,7 @@ public interface ModelContext {
@ModelFeatureFlag(owners = {"bjorncs"}) default boolean dynamicHeapSize() { return false; }
@ModelFeatureFlag(owners = {"hmusum"}) default String unknownConfigDefinition() { return "warn"; }
@ModelFeatureFlag(owners = {"hmusum"}) default int searchHandlerThreadpool() { return 2; }
+ @ModelFeatureFlag(owners = {"vekterli"}) default long mergingMaxMemoryUsagePerNode() { return -1; }
}
/** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */