GC control of use-per-document-delete and max-merge-memory from config production side in java.

3 files changed, 5 insertions, 24 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 6f0254145d6..b088231e84a 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
@@ -84,8 +84,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     private List<DataplaneToken> dataplaneTokens;
     private int contentLayerMetadataFeatureLevel = 0;
     private boolean dynamicHeapSize = false;
-    private long mergingMaxMemoryUsagePerNode = -1;
-    private boolean usePerDocumentThrottledDeleteBucket = false;
     private boolean restartOnDeployWhenOnnxModelChanges = false;
 
     @Override public ModelContext.FeatureFlags featureFlags() { return this; }
@@ -144,8 +142,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
     @Override public List<DataplaneToken> dataplaneTokens() { return dataplaneTokens; }
     @Override public int contentLayerMetadataFeatureLevel() { return contentLayerMetadataFeatureLevel; }
     @Override public boolean dynamicHeapSize() { return dynamicHeapSize; }
-    @Override public long mergingMaxMemoryUsagePerNode() { return mergingMaxMemoryUsagePerNode; }
-    @Override public boolean usePerDocumentThrottledDeleteBucket() { return usePerDocumentThrottledDeleteBucket; }
     @Override public boolean restartOnDeployWhenOnnxModelChanges() { return restartOnDeployWhenOnnxModelChanges; }
 
     public TestProperties sharedStringRepoNoReclaim(boolean sharedStringRepoNoReclaim) {
@@ -379,16 +375,6 @@ public class TestProperties implements ModelContext.Properties, ModelContext.Fea
 
     public TestProperties setDynamicHeapSize(boolean b) { this.dynamicHeapSize = b; return this; }
 
-    public TestProperties setMergingMaxMemoryUsagePerNode(long maxUsage) {
-        this.mergingMaxMemoryUsagePerNode = maxUsage;
-        return this;
-    }
-
-    public TestProperties setUsePerDocumentThrottledDeleteBucket(boolean enableThrottling) {
-        this.usePerDocumentThrottledDeleteBucket = enableThrottling;
-        return this;
-    }
-
     public TestProperties setRestartOnDeployForOnnxModelChanges(boolean enable) {
         this.restartOnDeployWhenOnnxModelChanges = enable;
         return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
index 18b9129cead..56ca23523b6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/FileStorProducer.java
@@ -47,7 +47,6 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
     private final int responseNumThreads;
     private final StorFilestorConfig.Response_sequencer_type.Enum responseSequencerType;
     private final boolean useAsyncMessageHandlingOnSchedule;
-    private final boolean usePerDocumentThrottledDeleteBucket;
 
     private static StorFilestorConfig.Response_sequencer_type.Enum convertResponseSequencerType(String sequencerType) {
         try {
@@ -63,9 +62,9 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
         this.responseNumThreads = featureFlags.defaultNumResponseThreads();
         this.responseSequencerType = convertResponseSequencerType(featureFlags.responseSequencerType());
         this.useAsyncMessageHandlingOnSchedule = featureFlags.useAsyncMessageHandlingOnSchedule();
-        this.usePerDocumentThrottledDeleteBucket = featureFlags.usePerDocumentThrottledDeleteBucket();
     }
 
+
     @Override
     public void getConfig(StorFilestorConfig.Builder builder) {
         if (numThreads != null) {
@@ -75,7 +74,7 @@ public class FileStorProducer implements StorFilestorConfig.Producer {
         builder.num_response_threads(responseNumThreads);
         builder.response_sequencer_type(responseSequencerType);
         builder.use_async_message_handling_on_schedule(useAsyncMessageHandlingOnSchedule);
-        builder.use_per_document_throttled_delete_bucket(usePerDocumentThrottledDeleteBucket);
+        builder.use_per_document_throttled_delete_bucket(true);
         var throttleBuilder = new StorFilestorConfig.Async_operation_throttler.Builder();
         builder.async_operation_throttler(throttleBuilder);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
index 1865db0ec1c..81fc19de929 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/storagecluster/StorServerProducer.java
@@ -29,7 +29,6 @@ public class StorServerProducer implements StorServerConfig.Producer {
     private final String clusterName;
     private Integer maxMergesPerNode;
     private Integer queueSize;
-    private Long mergingMaxMemoryUsagePerNode;
 
     private StorServerProducer setMaxMergesPerNode(Integer value) {
         if (value != null) {
@@ -46,7 +45,6 @@ public class StorServerProducer implements StorServerConfig.Producer {
 
     StorServerProducer(String clusterName, ModelContext.FeatureFlags featureFlags) {
         this.clusterName = clusterName;
-        this.mergingMaxMemoryUsagePerNode = featureFlags.mergingMaxMemoryUsagePerNode();
     }
 
     @Override
@@ -63,10 +61,8 @@ public class StorServerProducer implements StorServerConfig.Producer {
         if (queueSize != null) {
             builder.max_merge_queue_size(queueSize);
         }
-        if (mergingMaxMemoryUsagePerNode != null) {
-            builder.merge_throttling_memory_limit(
-                    new StorServerConfig.Merge_throttling_memory_limit.Builder()
-                            .max_usage_bytes(mergingMaxMemoryUsagePerNode));
-        }
+        builder.merge_throttling_memory_limit(
+                new StorServerConfig.Merge_throttling_memory_limit.Builder()
+                        .max_usage_bytes(0));
     }
 }