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/content/ContentSearchCluster.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/content/ContentSearchCluster.java')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java index bf8c96db614..34ea41384bc 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java @@ -303,7 +303,7 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer> if (element == null) { searchNode = SearchNode.create(parent, "" + node.getDistributionKey(), node.getDistributionKey(), spec, clusterName, node, flushOnShutdown, tuning, resourceLimits, deployState.isHosted(), - fractionOfMemoryReserved, redundancy, deployState.featureFlags()); + fractionOfMemoryReserved, deployState.featureFlags()); searchNode.setHostResource(node.getHostResource()); searchNode.initService(deployState); @@ -312,7 +312,7 @@ public class ContentSearchCluster extends TreeConfigProducer<AnyConfigProducer> tls.initService(deployState); } else { searchNode = new SearchNode.Builder(""+node.getDistributionKey(), spec, clusterName, node, flushOnShutdown, - tuning, resourceLimits, fractionOfMemoryReserved, redundancy) + tuning, resourceLimits, fractionOfMemoryReserved) .build(deployState, parent, element.getXml()); tls = new TransactionLogServer.Builder(clusterName, syncTransactionLog).build(deployState, searchNode, element.getXml()); } |