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.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 f9d56d518ca..fa7f6eedace 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -312,6 +312,14 @@ public class Flags {
TENANT_ID
);
+ public static final UnboundIntFlag DISTRIBUTOR_MERGE_BUSY_WAIT = defineIntFlag(
+ "distributor-merge-busy-wait", 10,
+ List.of("geirst", "vekterli"), "2021-10-04", "2021-12-31",
+ "Number of seconds that scheduling of new merge operations in the distributor should be inhibited " +
+ "towards a content node that has indicated merge busy",
+ "Takes effect at redeploy",
+ ZONE_ID, APPLICATION_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,