diff options
| author | Geir Storli <geirst@yahooinc.com> | 2021-12-13 14:58:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-13 14:58:18 +0100 |
| commit | 348b05de5ecbd4c36b7b5f694a7c26e69f0ea706 (patch) | |
| tree | 21958d955c0426229dacba8912b817270811b7fb | |
| parent | e4033438da88cc24ceefd440d51ba18909682736 (diff) | |
| parent | 57060fdac328fd215dee32c8f310a958a38c8b49 (diff) | |
Merge pull request #20492 from vespa-engine/balder/ignore-visibility-delay-for-sequencer
Ignore visibility delay when deciding feed sequencer type.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 8 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java | 2 |
2 files changed, 2 insertions, 8 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 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<SearchCluster> 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); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java index 6d3e83af927..68c623ec9a3 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java @@ -802,7 +802,7 @@ public class ContentBuilderTest extends DomBuilderTest { public void ensureFeedSequencerIsControlledByFlag() { verifyFeedSequencer("LATENCY", "LATENCY"); verifyFeedSequencer("ADAPTIVE", "ADAPTIVE"); - verifyFeedSequencer("THROUGHPUT", "LATENCY", 0); + verifyFeedSequencer("THROUGHPUT", "THROUGHPUT", 0); verifyFeedSequencer("THROUGHPUT", "THROUGHPUT", 0.1); verifyFeedSequencer("THOUGHPUT", "LATENCY"); |