summaryrefslogtreecommitdiffstats
path: root/config-model-api
diff options
context:
space:
mode:
authorGeir Storli <geirst@verizonmedia.com>2021-10-04 12:50:42 +0000
committerGeir Storli <geirst@verizonmedia.com>2021-10-04 12:50:42 +0000
commitfffcf762930b0119199622750658ebd3ab3703c4 (patch)
treec128eedbc481423ec3df1d246989d631def837cd /config-model-api
parent3f68eb7eb2f03020bed40f328294a0c9300fa17e (diff)
Add feature flag for distributor merge busy wait.
Diffstat (limited to 'config-model-api')
-rw-r--r--config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
index 18373cfcefe..694193923c5 100644
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
+++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
@@ -96,6 +96,7 @@ public interface ModelContext {
@ModelFeatureFlag(owners = {"geirst", "vekterli"}) default double minNodeRatioPerGroup() { return 0.0; }
@ModelFeatureFlag(owners = {"arnej"}) default boolean newLocationBrokerLogic() { return true; }
@ModelFeatureFlag(owners = {"bjorncs"}) default int maxConnectionLifeInHosted() { return 45; }
+ @ModelFeatureFlag(owners = {"geirst", "vekterli"}) default int distributorMergeBusyWait() { return 10; }
}
/** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */