Add feature flag for controlling throttling of merge feed ops

1 files changed, 10 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 a9c0711f148..271c75fe446 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -344,6 +344,16 @@ public class Flags {
             "Takes effect on redeployment",
             ZONE_ID, APPLICATION_ID);
 
+    public static final UnboundBooleanFlag PERSISTENCE_THROTTLING_OF_MERGE_FEED_OPS = defineFeatureFlag(
+            "persistence-throttling-of-merge-feed-ops", true,
+            List.of("vekterli"), "2022-02-24", "2022-06-01",
+            "If true, each put/remove contained within a merge is individually throttled as if it " +
+            "were a put/remove from a client. If false, merges are throttled at a persistence thread " +
+            "level, i.e. per ApplyBucketDiff message, regardless of how many document operations " +
+            "are contained within. Only applies if DYNAMIC policy is used.",
+            "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",