Control reindexer resource usage with a feature flag

3 files changed, 8 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
index f8932b415b1..14fbeb17aaf 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainer.java
@@ -155,6 +155,7 @@ public class ClusterControllerContainer extends Container implements
         }
 
         builder.enabled(ctx.reindexing().enabled());
+        builder.windowSizeIncrement(ctx.windowSizeIncrement());
         for (String clusterId : ctx.clusterIds()) {
             ReindexingConfig.Clusters.Builder clusterBuilder = new ReindexingConfig.Clusters.Builder();
             for (NewDocumentType type : ctx.documentTypesForCluster(clusterId)) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
index 63fc0b4515f..3fe6ce3ff27 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ClusterControllerContainerCluster.java
@@ -35,7 +35,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
         Reindexing reindexing = deployState.featureFlags().enableAutomaticReindexing()
                 ? deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE)
                 : Reindexing.DISABLED_INSTANCE;
-        return new ReindexingContext(reindexing);
+        return new ReindexingContext(reindexing, deployState.featureFlags().reindexerWindowSizeIncrement());
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
index 712498f78cb..7380b950fb2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/clustercontroller/ReindexingContext.java
@@ -21,9 +21,11 @@ public class ReindexingContext {
     private final Object monitor = new Object();
     private final Map<String, Set<NewDocumentType>> documentTypesPerCluster = new HashMap<>();
     private final Reindexing reindexing;
+    private final double windowSizeIncrement;
 
-    public ReindexingContext(Reindexing reindexing) {
+    public ReindexingContext(Reindexing reindexing, double windowSizeIncrement) {
         this.reindexing = Objects.requireNonNull(reindexing);
+        this.windowSizeIncrement = windowSizeIncrement;
     }
 
     public void addDocumentType(String clusterId, NewDocumentType type) {
@@ -46,4 +48,7 @@ public class ReindexingContext {
     }
 
     public Reindexing reindexing() { return reindexing; }
+
+    public double windowSizeIncrement() { return windowSizeIncrement; }
+
 }