diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-05-13 09:23:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 09:23:48 +0200 |
| commit | 4154af8419d58fb3cf6834bf89eb67c88248a196 (patch) | |
| tree | 835d3878d4effa50efe2c8df28bacf837730ff31 | |
| parent | c9aee09db9ccf35df9dc677ad4e308a55af3db97 (diff) | |
| parent | afaf514f0d3e89aa532b1701b8d1386d5166bce2 (diff) | |
Merge pull request #13227 from vespa-engine/balder/increase-default-feed-concurrency
Increase default feed concurrency from 0.4 to 0.5
| -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 fcaba66ef69..1bf9bc10be4 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 @@ -315,7 +315,7 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot @Override public void getConfig(ProtonConfig.Builder builder) { - builder.feeding.concurrency(0.40); // As if specified 0.8 in services.xml + builder.feeding.concurrency(0.50); // As if specified 1.0 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 97417f5a522..4005418f8dc 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.40, 0.40); - verifyConcurrency("streaming", "", 0.8, 0.0); - verifyConcurrency("store-only", "", 0.8, 0.0); + verifyConcurrency("index", "", 0.50, 0.50); + verifyConcurrency("streaming", "", 1.0, 0.0); + verifyConcurrency("store-only", "", 1.0, 0.0); } @Test public void requireThatMixedModeConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.8, Arrays.asList(0.40, 0.0)); + verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 1.0, Arrays.asList(0.50, 0.0)); } @Test public void requireThatMixedModeConcurrencyIsReflected() { |