From 57060fdac328fd215dee32c8f310a958a38c8b49 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Mon, 13 Dec 2021 14:34:10 +0100 Subject: Ignore visibility delay when deciding feed sequencer type. --- .../java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'config-model/src/main/java/com/yahoo') 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 d5500e7d040..13c3c229acb 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 @@ -435,13 +435,7 @@ public class ContentSearchCluster extends AbstractConfigProducer redundancy.getConfig(builder); } - 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); - } + builder.indexing.optimize(feedSequencerType); builder.indexing.tasklimit(feedTaskLimit); builder.feeding.master_task_limit(feedMasterTaskLimit); builder.feeding.shared_field_writer_executor(sharedFieldWriterExecutor); -- cgit v1.2.3