aboutsummaryrefslogtreecommitdiffstats
path: root/flags/src/main/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 /flags/src/main/java
parent96f6abe9caa338074ee39cb2fd566d3efff464c9 (diff)
Add feature flag for controlling memory limits for merge operations
Diffstat (limited to 'flags/src/main/java')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java9
1 files changed, 9 insertions, 0 deletions
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 9c2669eebe0..d701a35c2ef 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -423,6 +423,15 @@ public class Flags {
"Whether to send cloud trial email notifications",
"Takes effect immediately");
+ public static final UnboundLongFlag MERGING_MAX_MEMORY_USAGE_PER_NODE = defineLongFlag(
+ "merging-max-memory-usage-per-node", -1,
+ List.of("vekterli"), "2023-11-03", "2024-03-01",
+ "Soft limit of the maximum amount of memory that can be used across merge operations on a content node. " +
+ "Value semantics: < 0: unlimited (legacy behavior), == 0: auto-deduced from node HW and config," +
+ " > 0: explicit memory usage limit in bytes.",
+ "Takes effect at redeployment",
+ INSTANCE_ID);
+
/** WARNING: public for testing: All flags should be defined in {@link Flags}. */
public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, List<String> owners,
String createdAt, String expiresAt, String description,