diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-30 16:06:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 16:06:18 +0100 |
| commit | 343f5555420577915cde15b76476e3e46699d20a (patch) | |
| tree | 7e76cadd80d84e770e01617f8845d326691421dd /config-model/src | |
| parent | 60816fd636024deb0263681d64dc89cb5594ccc0 (diff) | |
| parent | 47a3ffe8aaeef1240db829164ffd63958a10019f (diff) | |
Merge pull request #30105 from vespa-engine/balder/use_per_document_throttled_delete_bucketv8.296.15
GC leftovers from use_per_document_throttled_delete_bucket
Diffstat (limited to 'config-model/src')
2 files changed, 1 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java index cbeac3cc849..0d85696d503 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerCluster.java @@ -203,7 +203,7 @@ public class MetricsProxyContainerCluster extends ContainerCluster<MetricsProxyC private Optional<String> getSystemName() { Monitoring monitoring = getMonitoringService(); - return monitoring != null && ! monitoring.getClustername().equals("") ? + return monitoring != null && !monitoring.getClustername().isEmpty() ? Optional.of(monitoring.getClustername()) : Optional.empty(); } 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 56ca23523b6..4f283d6d9c3 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 @@ -74,7 +74,6 @@ 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(true); var throttleBuilder = new StorFilestorConfig.Async_operation_throttler.Builder(); builder.async_operation_throttler(throttleBuilder); } |