summaryrefslogtreecommitdiffstats
path: root/flags
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-02-11 13:13:08 +0000
committerGeir Storli <geirst@yahooinc.com>2022-02-11 13:13:08 +0000
commit025df33c53f5ab6c6ae25f7e4ada4eda8bdf269c (patch)
tree63338ab85d56dd7b96ac07ab21b0941c0ed691af /flags
parent662eb8a1c2ed6e4fbe0442beae38a5962faa05f5 (diff)
Add "inhibit-default-merges-when-global-merges-pending" feature flag.
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 9c1e1776894..2e985a4fca0 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -328,6 +328,14 @@ public class Flags {
"Takes effect on redeployment",
ZONE_ID, APPLICATION_ID);
+ public static final UnboundBooleanFlag INHIBIT_DEFAULT_MERGES_WHEN_GLOBAL_MERGES_PENDING = defineFeatureFlag(
+ "inhibit-default-merges-when-global-merges-pending", false,
+ List.of("geirst", "vekterli"), "2022-02-11", "2022-06-01",
+ "Inhibits all merges to buckets in the default bucket space if the current " +
+ "cluster state bundle indicates that global merges are pending in the cluster",
+ "Takes effect on redeployment",
+ ZONE_ID, APPLICATION_ID);
+
public static final UnboundBooleanFlag CHECK_CONFIG_CONVERGENCE_BEFORE_RESTARTING = defineFeatureFlag(
"check-config-convergence-before-restart", true,
List.of("hmusum"), "2022-01-16", "2022-02-16",