summaryrefslogtreecommitdiffstats
path: root/config-model/src/main
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-07-08 16:31:42 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-07-08 16:31:42 +0000
commit48eeb176bcfa38037109abad6d9bd490f9b0830c (patch)
treedd188af23c1d95eb98c3ce1ba53c20d9e685ce8c /config-model/src/main
parent1828213155d2254361ea515941cad0b84a87b0e8 (diff)
Avoid that desire for low latency and high feed throughput selects the conservative solution.
Diffstat (limited to 'config-model/src/main')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java8
1 files changed, 7 insertions, 1 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 3efc26913a0..f329f62ee7b 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
@@ -392,7 +392,13 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
if (hasAnyNonIndexedCluster) {
builder.feeding.concurrency(builder.feeding.build().concurrency() * 2);
}
- builder.indexing.optimize(feedSequencerType);
+ if ((feedSequencerType == ProtonConfig.Indexing.Optimize.Enum.THROUGHPUT) && (visibilityDelay == 0.0)) {
+ // THROUGHPUT and zero visibilityDelay is inconsistent and currently a suboptimal combination, defaulting to LATENCY.
+ // TODO: Once we have figured out optimal combination this limitation will be cleaned up.
+ builder.indexing.optimize(ProtonConfig.Indexing.Optimize.Enum.LATENCY);
+ } else {
+ builder.indexing.optimize(feedSequencerType);
+ }
}
private boolean isGloballyDistributed(NewDocumentType docType) {