diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-06 11:22:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 11:22:00 +0200 |
| commit | f8efaab3d1c8116afc1dc2b3cdf65248ede5c58e (patch) | |
| tree | c30d8a319002232c3244f0e09c25fe4d9e395c4e | |
| parent | d7fd47c7f7165a4ae40b33e675338a5ed412e1b2 (diff) | |
| parent | bb5d7e703c2c652a5ea77b176028a6b56a01a202 (diff) | |
Merge pull request #10190 from vespa-engine/balder/feed-concurrency-35-percent
30% -> 35% feed concurrency.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java | 2 | ||||
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java | 8 |
2 files changed, 5 insertions, 5 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 a6228af8991..b5f01651e57 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 @@ -310,7 +310,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot @Override public void getConfig(ProtonConfig.Builder builder) { double visibilityDelay = hasIndexedCluster() ? getIndexed().getVisibilityDelay() : 0.0; - builder.feeding.concurrency(0.30); // As if specified 0.6 in services.xml + builder.feeding.concurrency(0.35); // As if specified 0.7 in services.xml boolean hasAnyNonIndexedCluster = false; for (NewDocumentType type : TopologicalDocumentTypeSorter.sort(documentDefinitions.values())) { ProtonConfig.Documentdb.Builder ddbB = new ProtonConfig.Documentdb.Builder(); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java index b2c7da4b851..4ccdd80805b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/DocumentDatabaseTestCase.java @@ -116,13 +116,13 @@ public class DocumentDatabaseTestCase { @Test public void requireThatConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency("index", "", 0.30, 0.30); - verifyConcurrency("streaming", "", 0.6, 0.0); - verifyConcurrency("store-only", "", 0.6, 0.0); + verifyConcurrency("index", "", 0.35, 0.35); + verifyConcurrency("streaming", "", 0.7, 0.0); + verifyConcurrency("store-only", "", 0.7, 0.0); } @Test public void requireThatMixedModeConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.6, Arrays.asList(0.30, 0.0)); + verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.7, Arrays.asList(0.35, 0.0)); } @Test public void requireThatMixedModeConcurrencyIsReflected() { |