Control prune job with feature flag.

2 files changed, 10 insertions, 0 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 75a1a167446..810b2db584a 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
@@ -53,6 +53,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private double feedConcurrency = 0.5;
     private boolean useBucketExecutorForLidSpaceCompact;
     private boolean useBucketExecutorForBucketMove;
+    private boolean useBucketExecutorForPruneRemoved;
     private boolean enableFeedBlockInDistributor = true;
     private double maxDeadBytesRatio = 0.2;
     private int clusterControllerMaxHeapSizeInMb = 256;
@@ -95,6 +96,7 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @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; }
     @Override public int clusterControllerMaxHeapSizeInMb() { return clusterControllerMaxHeapSizeInMb; }
@@ -210,6 +212,11 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
         return this;
     }
 
+    public TestProperties useBucketExecutorForPruneRemoved(boolean enabled) {
+        useBucketExecutorForPruneRemoved = enabled;
+        return this;
+    }
+
     public TestProperties enableFeedBlockInDistributor(boolean enabled) {
         enableFeedBlockInDistributor = 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 1dd5074aedb..23cce0c1fb9 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
@@ -68,6 +68,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     private final double defaultFeedConcurrency;
     private final boolean useBucketExecutorForLidSpaceCompact;
     private final boolean useBucketExecutorForBucketMove;
+    private final boolean useBucketExecutorForPruneRemoved;
     private final double defaultMaxDeadBytesRatio;
 
     /** Whether the nodes of this cluster also hosts a container cluster in a hosted system */
@@ -216,6 +217,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         defaultFeedConcurrency = featureFlags.feedConcurrency();
         useBucketExecutorForLidSpaceCompact = featureFlags.useBucketExecutorForLidSpaceCompact();
         useBucketExecutorForBucketMove = featureFlags.useBucketExecutorForBucketMove();
+        useBucketExecutorForPruneRemoved = featureFlags.useBucketExecutorForPruneRemoved();
         defaultMaxDeadBytesRatio = featureFlags.maxDeadBytesRatio();
     }
 
@@ -437,6 +439,7 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
         builder.maintenancejobs.maxoutstandingmoveops(maxPendingMoveOps);
         builder.lidspacecompaction.usebucketexecutor(useBucketExecutorForLidSpaceCompact);
         builder.bucketmove.usebucketexecutor(useBucketExecutorForBucketMove);
+        builder.pruneremoveddocuments.usebucketexecutor(useBucketExecutorForPruneRemoved);
     }
 
     private boolean isGloballyDistributed(NewDocumentType docType) {