diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-07-22 10:54:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 10:54:55 +0200 |
| commit | f66d203baf8fa69c8b805934d573738dcb7e8c30 (patch) | |
| tree | 29f2f8a0437344f0329e9d9f4d0e145dc2d6b8c8 /config-model | |
| parent | a9073823f94f2643528a071d6ca9bda01b632eb9 (diff) | |
| parent | 3ba041a89d08e3fe512734ec4172b8501691b779 (diff) | |
Merge pull request #9905 from vespa-engine/balder/increase-default-feedconcurrency-from-25-to-30-percent
Increase default max feed concurrency from 25% to 30% on the way to 4..
Diffstat (limited to 'config-model')
| -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 db7b4a88721..a3099fe3ed4 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 @@ -306,7 +306,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.25); // As if specified 0.5 in services.xml + builder.feeding.concurrency(0.30); // As if specified 0.6 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 c43787b37e0..2415aadc8a3 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 @@ -118,13 +118,13 @@ public class DocumentDatabaseTestCase { @Test public void requireThatConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency("index", "", 0.25, 0.25); - verifyConcurrency("streaming", "", 0.5, 0.0); - verifyConcurrency("store-only", "", 0.5, 0.0); + verifyConcurrency("index", "", 0.30, 0.30); + verifyConcurrency("streaming", "", 0.6, 0.0); + verifyConcurrency("store-only", "", 0.6, 0.0); } @Test public void requireThatMixedModeConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.5, Arrays.asList(0.25, 0.0)); + verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.6, Arrays.asList(0.30, 0.0)); } @Test public void requireThatMixedModeConcurrencyIsReflected() { |