diff options
author | Frode Lundgren <frodelu@yahooinc.com> | 2023-08-01 18:21:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 18:21:42 +0200 |
commit | b81a83cd54f5d90ac1c12863fb26c7cf2b0038af (patch) | |
tree | 2b6807c387d6b0f682a696547d1f2e476b099aa3 /config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java | |
parent | c456d738b06daf9d04b3cb8c43c82e33dcd06860 (diff) | |
parent | f553e748b93d7492c0743e508c3d00c27d091500 (diff) |
Merge pull request #27944 from vespa-engine/revert-27937-balder/more-conservative-initial-document-countv8.205.14
Revert "- initial document count must be number of unique documents per node." MERGEOK
Diffstat (limited to 'config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java | 8 |
1 files changed, 2 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 02f15ed06cd..1ad99404823 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 @@ -4,7 +4,6 @@ package com.yahoo.vespa.model.search; import com.yahoo.config.provision.NodeResources; import com.yahoo.vespa.config.search.core.ProtonConfig; import com.yahoo.vespa.model.Host; -import com.yahoo.vespa.model.content.Redundancy; import static java.lang.Long.min; import static java.lang.Long.max; @@ -28,16 +27,13 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { private final NodeResources resources; private final int threadsPerSearch; private final double fractionOfMemoryReserved; - private final Redundancy redundancy; public NodeResourcesTuning(NodeResources resources, int threadsPerSearch, - double fractionOfMemoryReserved, - Redundancy redundancy) { + double fractionOfMemoryReserved) { this.resources = resources; this.threadsPerSearch = threadsPerSearch; this.fractionOfMemoryReserved = fractionOfMemoryReserved; - this.redundancy = redundancy; } @Override @@ -61,7 +57,7 @@ public class NodeResourcesTuning implements ProtonConfig.Producer { ProtonConfig.Documentdb dbCfg = builder.build(); if (dbCfg.mode() != ProtonConfig.Documentdb.Mode.Enum.INDEX) { long numDocs = (long)usableMemoryGb() * GB / MEMORY_COST_PER_DOCUMENT_STORE_ONLY; - builder.allocation.initialnumdocs(numDocs/redundancy.readyCopies()); + builder.allocation.initialnumdocs(numDocs); } } |