diff options
| author | Harald Musum <musum@yahooinc.com> | 2023-04-20 10:56:43 +0200 |
|---|---|---|
| committer | Harald Musum <musum@yahooinc.com> | 2023-04-20 10:56:43 +0200 |
| commit | 7c3eee5a83e5ee92bc7d43e17383e639d7c06bcc (patch) | |
| tree | 9627fe391735e7047863139ed087435c502c6dc7 /config-model/src/main/java/com/yahoo | |
| parent | 04ff50210cba21487fb78728831ed339ecd82fff (diff) | |
| parent | 4bf83d5e87a8896ce3b6a14fb0889a2891053bf1 (diff) | |
Merge branch 'master' into hmusum/configure-max-content-groups-allowed-down
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java index ee18eceb719..2de06e2053a 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java @@ -18,7 +18,6 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { private final static double SUMMARY_CACHE_SIZE_AS_FRACTION_OF_MEMORY = 0.04; private final static double MEMORY_GAIN_AS_FRACTION_OF_MEMORY = 0.08; private final static double MIN_MEMORY_PER_FLUSH_THREAD_GB = 16.0; - private final static double MAX_FLUSH_THREAD_RATIO = 1.0/8; private final static double TLS_SIZE_FRACTION = 0.02; final static long MB = 1024 * 1024; public final static long GB = MB * 1024; @@ -94,13 +93,12 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { } private void tuneFlushConcurrentThreads(ProtonConfig.Flush.Builder builder) { + int max_concurrent = 2; // TODO bring slowly up towards 4 if (usableMemoryGb() < MIN_MEMORY_PER_FLUSH_THREAD_GB) { - builder.maxconcurrent(1); + max_concurrent = 1; } - double min_concurrent_mem = usableMemoryGb() / (2*MIN_MEMORY_PER_FLUSH_THREAD_GB); - double min_concurrent_cpu = resources.vcpu() * MAX_FLUSH_THREAD_RATIO; - builder.maxconcurrent(Math.min(builder.build().maxconcurrent(), - (int)Math.ceil(Math.max(min_concurrent_mem, min_concurrent_cpu)))); + double min_concurrent_mem = usableMemoryGb() / MIN_MEMORY_PER_FLUSH_THREAD_GB; + builder.maxconcurrent(Math.min(max_concurrent, (int)Math.ceil(min_concurrent_mem))); } private void tuneFlushStrategyTlsSize(ProtonConfig.Flush.Memory.Builder builder) { |