summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
Diffstat (limited to 'flags')
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java14
1 files changed, 14 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 0ce7ec2259d..fdf2acb839e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -204,6 +204,20 @@ public class Flags {
"Takes effect after distributor restart",
ZONE_ID, APPLICATION_ID);
+ public static final UnboundIntFlag MAX_CONCURRENT_MERGES_PER_NODE = defineIntFlag(
+ "max-concurrent-merges-per-node", 16,
+ List.of("balder", "vekterli"), "2021-06-06", "2021-08-01",
+ "Specifies max concurrent merges per content node.",
+ "Takes effect at redeploy",
+ ZONE_ID, APPLICATION_ID);
+
+ public static final UnboundIntFlag MAX_MERGE_QUEUE_SIZE = defineIntFlag(
+ "max-merge-queue-size", 1024,
+ List.of("balder", "vekterli"), "2021-06-06", "2021-08-01",
+ "Specifies max size of merge queue.",
+ "Takes effect at redeploy",
+ ZONE_ID, APPLICATION_ID);
+
public static final UnboundBooleanFlag USE_EXTERNAL_RANK_EXPRESSION = defineFeatureFlag(
"use-external-rank-expression", false,
List.of("baldersheim"), "2021-05-24", "2021-07-01",