From 3a4010e278b0ca3418d9a4b08c1978ab420953c4 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Fri, 3 Nov 2023 14:14:20 +0100 Subject: Add feature flag for controlling memory limits for merge operations --- .../src/main/java/com/yahoo/config/model/api/ModelContext.java | 1 + 1 file changed, 1 insertion(+) (limited to 'config-model-api') 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! */ -- cgit v1.2.3