summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-01-25 14:28:47 +0100
committerTor Brede Vekterli <vekterli@yahooinc.com>2022-01-25 14:28:47 +0100
commite68f0aa6f7cb59440f638dcb87e0d27bf53ce9a8 (patch)
tree00042043b10971852f4b04fadfac13e15106cdc1 /flags
parent1608bedc17ea020f0a5a4834552aded54e82ab5d (diff)
Add feature flag for merge throttling policy
Two options; `STATIC` (default) and `DYNAMIC`. Does not currently set any window size configs based on the existing feature flag for max pending, so the config defaults will be used for these when dynamic throttling is enabled.
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java8
1 files changed, 8 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 30a7c2cd600..470bf9a0c1c 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -357,6 +357,14 @@ public class Flags {
"Triggers restart, takes effect immediately",
ZONE_ID, APPLICATION_ID);
+ public static final UnboundStringFlag MERGE_THROTTLING_POLICY = defineStringFlag(
+ "merge-throttling-policy", "STATIC",
+ List.of("vekterli"), "2022-01-25", "2022-05-01",
+ "Sets the policy used for merge throttling on the content nodes. " +
+ "Valid values: STATIC, DYNAMIC",
+ "Takes effect at redeployment",
+ ZONE_ID, APPLICATION_ID);
+
public static final UnboundBooleanFlag CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING = defineFeatureFlag(
"check-config-convergence-before-restart", false,
List.of("hmusum"), "2022-01-16", "2022-02-16",