diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-23 12:34:26 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-23 12:37:06 +0100 |
commit | 99243c9ef67f98b34c4047c75ec52a3785001a81 (patch) | |
tree | 859321bec47270ced60a3ff0058f8a1a10cb9ead /config-model | |
parent | 056a486a55fd66c39b9b30065865d29655f338f7 (diff) |
GC control of use-per-document-delete and max-merge-memory from config production side in java.
Diffstat (limited to 'config-model')
4 files changed, 6 insertions, 58 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)); } } diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java index bdd61d93136..af21963a8a2 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java @@ -189,7 +189,7 @@ public class StorageClusterTest { var config = configFromProperties(new TestProperties()); var limit = config.merge_throttling_memory_limit(); - assertEquals(-1L, limit.max_usage_bytes()); // TODO change default + assertEquals(0L, limit.max_usage_bytes()); // TODO change default assertMergeAutoScaleConfigHasExpectedValues(limit); } @@ -200,21 +200,6 @@ public class StorageClusterTest { } @Test - void merge_throttler_memory_limit_is_controlled_by_feature_flag() { - var config = configFromProperties(new TestProperties().setMergingMaxMemoryUsagePerNode(-1)); - assertEquals(-1L, config.merge_throttling_memory_limit().max_usage_bytes()); - - config = configFromProperties(new TestProperties().setMergingMaxMemoryUsagePerNode(0)); - assertEquals(0L, config.merge_throttling_memory_limit().max_usage_bytes()); - - config = configFromProperties(new TestProperties().setMergingMaxMemoryUsagePerNode(1_234_456_789)); - assertEquals(1_234_456_789L, config.merge_throttling_memory_limit().max_usage_bytes()); - - // Feature flag should not affect the other config values - assertMergeAutoScaleConfigHasExpectedValues(config.merge_throttling_memory_limit()); - } - - @Test void testVisitors() { StorVisitorConfig.Builder builder = new StorVisitorConfig.Builder(); parse(cluster("bees", @@ -355,24 +340,6 @@ public class StorageClusterTest { assertTrue(config.async_operation_throttler().throttle_individual_merge_feed_ops()); } - private void verifyUsePerDocumentThrottledDeleteBucket(boolean expected, Boolean enabled) { - var props = new TestProperties(); - if (enabled != null) { - props.setUsePerDocumentThrottledDeleteBucket(enabled); - } - var config = filestorConfigFromProducer(simpleCluster(props)); - assertEquals(expected, config.use_per_document_throttled_delete_bucket()); - } - - @Test - void delete_bucket_throttling_is_controlled_by_feature_flag() { - // TODO update default once rolled out and tested - verifyUsePerDocumentThrottledDeleteBucket(false, null); - - verifyUsePerDocumentThrottledDeleteBucket(false, false); - verifyUsePerDocumentThrottledDeleteBucket(true, true); - } - @Test void testCapacity() { String xml = joinLines( |