Merge pull request #16434 from vespa-engine/jonmv/remove-reindexer-window-size-flag

Remove obsolete feature falg

3 files changed, 2 insertions, 8 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 4cb3dde0833..10d3d52561f 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,7 +155,6 @@ 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 8423f7d723a..f222a1f3de1 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
@@ -32,8 +32,7 @@ public class ClusterControllerContainerCluster extends ContainerCluster<ClusterC
     public ReindexingContext reindexingContext() { return reindexingContext; }
 
     private static ReindexingContext createReindexingContext(DeployState deployState) {
-        Reindexing reindexing = deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE);
-        return new ReindexingContext(reindexing, deployState.featureFlags().reindexerWindowSizeIncrement());
+        return new ReindexingContext(deployState.reindexing().orElse(Reindexing.DISABLED_INSTANCE));
     }
 
 }
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 7380b950fb2..026c0b93712 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,11 +21,9 @@ 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, double windowSizeIncrement) {
+    public ReindexingContext(Reindexing reindexing) {
         this.reindexing = Objects.requireNonNull(reindexing);
-        this.windowSizeIncrement = windowSizeIncrement;
     }
 
     public void addDocumentType(String clusterId, NewDocumentType type) {
@@ -49,6 +47,4 @@ public class ReindexingContext {
 
     public Reindexing reindexing() { return reindexing; }
 
-    public double windowSizeIncrement() { return windowSizeIncrement; }
-
 }