Merge pull request #17727 from vespa-engine/balder/gc-unused-bucket-executor-feature-flag

GC now unused unused flags.

3 files changed, 1 insertions, 79 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 810b2db584a..93606236ea7 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -43,7 +43,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private String sequencerType = "LATENCY";
     private String responseSequencerType = "ADAPTIVE";
     private int responseNumThreads = 2;
-    private int maxPendingMoveOps = 10;
     private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty();
     private AthenzDomain athenzDomain;
     private ApplicationRoles applicationRoles;
@@ -51,8 +50,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private boolean useAccessControlTlsHandshakeClientAuth;
     private boolean useAsyncMessageHandlingOnSchedule = false;
     private double feedConcurrency = 0.5;
-    private boolean useBucketExecutorForLidSpaceCompact;
-    private boolean useBucketExecutorForBucketMove;
     private boolean useBucketExecutorForPruneRemoved;
     private boolean enableFeedBlockInDistributor = true;
     private double maxDeadBytesRatio = 0.2;
@@ -86,7 +83,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public Optional<ApplicationRoles> applicationRoles() { return Optional.ofNullable(applicationRoles); }
     @Override public String responseSequencerType() { return responseSequencerType; }
     @Override public int defaultNumResponseThreads() { return responseNumThreads; }
-    @Override public int maxPendingMoveOps() { return maxPendingMoveOps; }
     @Override public boolean skipCommunicationManagerThread() { return false; }
     @Override public boolean skipMbusRequestThread() { return false; }
     @Override public boolean skipMbusReplyThread() { return false; }
@@ -94,8 +90,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public boolean useAccessControlTlsHandshakeClientAuth() { return useAccessControlTlsHandshakeClientAuth; }
     @Override public boolean useAsyncMessageHandlingOnSchedule() { return useAsyncMessageHandlingOnSchedule; }
     @Override public double feedConcurrency() { return feedConcurrency; }
-    @Override public boolean useBucketExecutorForLidSpaceCompact() { return useBucketExecutorForLidSpaceCompact; }
-    @Override public boolean useBucketExecutorForBucketMove() { return useBucketExecutorForBucketMove; }
     @Override public boolean useBucketExecutorForPruneRemoved() { return useBucketExecutorForPruneRemoved; }
     @Override public boolean enableFeedBlockInDistributor() { return enableFeedBlockInDistributor; }
     @Override public double maxDeadBytesRatio() { return maxDeadBytesRatio; }
@@ -133,10 +127,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         responseNumThreads = numThreads;
         return this;
     }
-    public TestProperties setMaxPendingMoveOps(int moveOps) {
-        maxPendingMoveOps = moveOps;
-        return this;
-    }
+
     public TestProperties setDefaultTermwiseLimit(double limit) {
         defaultTermwiseLimit = limit;
         return this;
@@ -202,16 +193,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
-    public TestProperties useBucketExecutorForLidSpaceCompact(boolean enabled) {
-        useBucketExecutorForLidSpaceCompact = enabled;
-        return this;
-    }
-
-    public TestProperties useBucketExecutorForBucketMove(boolean enabled) {
-        useBucketExecutorForBucketMove = enabled;
-        return this;
-    }
-
     public TestProperties useBucketExecutorForPruneRemoved(boolean enabled) {
         useBucketExecutorForPruneRemoved = enabled;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 23cce0c1fb9..ec5b5c03402 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -64,10 +64,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private final Map<StorageGroup, NodeSpec> groupToSpecMap = new LinkedHashMap<>();
     private Optional<ResourceLimits> resourceLimits = Optional.empty();
     private final ProtonConfig.Indexing.Optimize.Enum feedSequencerType;
-    private final int maxPendingMoveOps;
     private final double defaultFeedConcurrency;
-    private final boolean useBucketExecutorForLidSpaceCompact;
-    private final boolean useBucketExecutorForBucketMove;
     private final boolean useBucketExecutorForPruneRemoved;
     private final double defaultMaxDeadBytesRatio;
 
@@ -212,11 +209,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         this.syncTransactionLog = syncTransactionLog;
 
         this.combined = combined;
-        maxPendingMoveOps = featureFlags.maxPendingMoveOps();
         feedSequencerType = convertFeedSequencerType(featureFlags.feedSequencerType());
         defaultFeedConcurrency = featureFlags.feedConcurrency();
-        useBucketExecutorForLidSpaceCompact = featureFlags.useBucketExecutorForLidSpaceCompact();
-        useBucketExecutorForBucketMove = featureFlags.useBucketExecutorForBucketMove();
         useBucketExecutorForPruneRemoved = featureFlags.useBucketExecutorForPruneRemoved();
         defaultMaxDeadBytesRatio = featureFlags.maxDeadBytesRatio();
     }
@@ -436,9 +430,6 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         } else {
             builder.indexing.optimize(feedSequencerType);
         }
-        builder.maintenancejobs.maxoutstandingmoveops(maxPendingMoveOps);
-        builder.lidspacecompaction.usebucketexecutor(useBucketExecutorForLidSpaceCompact);
-        builder.bucketmove.usebucketexecutor(useBucketExecutorForBucketMove);
         builder.pruneremoveddocuments.usebucketexecutor(useBucketExecutorForPruneRemoved);
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index 3168b57100f..ad4603e5c6b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -824,39 +824,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         verifyThatFeatureFlagControlsVisibilityDelayDefault(0.6, 0.6);
     }
 
-    private void verifyThatFeatureFlagControlsUseBucketExecutorForLidSpaceCompact(boolean flag) {
-        DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().useBucketExecutorForLidSpaceCompact(flag));
-        VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
-                .withServices(singleNodeContentXml())
-                .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
-                .build())
-                .create(deployStateBuilder);
-        ProtonConfig config = getProtonConfig(model.getContentClusters().values().iterator().next());
-        assertEquals(flag, config.lidspacecompaction().usebucketexecutor());
-    }
-
-    private void verifyThatFeatureFlagControlsUseBucketExecutorForBucketMove(boolean flag) {
-        DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().useBucketExecutorForBucketMove(flag));
-        VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
-                .withServices(singleNodeContentXml())
-                .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
-                .build())
-                .create(deployStateBuilder);
-        ProtonConfig config = getProtonConfig(model.getContentClusters().values().iterator().next());
-        assertEquals(flag, config.bucketmove().usebucketexecutor());
-    }
-
-    private void verifyThatFeatureFlagControlsMaxpendingMoveOps(int moveOps) {
-        DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().setMaxPendingMoveOps(moveOps));
-        VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
-                .withServices(singleNodeContentXml())
-                .withSearchDefinition(MockApplicationPackage.MUSIC_SEARCHDEFINITION)
-                .build())
-                .create(deployStateBuilder);
-        ProtonConfig config = getProtonConfig(model.getContentClusters().values().iterator().next());
-        assertEquals(moveOps, config.maintenancejobs().maxoutstandingmoveops());
-    }
-
     private void verifyThatFeatureFlagControlsUseBucketExecutorForPruneRemoved(boolean flag) {
         DeployState.Builder deployStateBuilder = new DeployState.Builder().properties(new TestProperties().useBucketExecutorForPruneRemoved(flag));
         VespaModel model = new VespaModelCreatorWithMockPkg(new MockApplicationPackage.Builder()
@@ -868,23 +835,6 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals(flag, config.pruneremoveddocuments().usebucketexecutor());
     }
 
-    @Test
-    public void verifyMaxPendingMoveOps() {
-        verifyThatFeatureFlagControlsMaxpendingMoveOps(13);
-        verifyThatFeatureFlagControlsMaxpendingMoveOps(107);
-    }
-
-    @Test
-    public void verifyUseBucketExecutorForLidSpaceCompact() {
-        verifyThatFeatureFlagControlsUseBucketExecutorForLidSpaceCompact(true);
-        verifyThatFeatureFlagControlsUseBucketExecutorForLidSpaceCompact(false);
-    }
-
-    @Test
-    public void verifyUseBucketExecutorForBucketMove() {
-        verifyThatFeatureFlagControlsUseBucketExecutorForBucketMove(true);
-        verifyThatFeatureFlagControlsUseBucketExecutorForBucketMove(false);
-    }
 
     @Test
     public void verifyUseBucketExecutorForPruneRemoved() {