Default feed concurrency of 0.5, up from 0.4.

2 files changed, 7 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 7900ce9ffec..219c8a01afe 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.2);
+        builder.feeding.concurrency(0.25); // As if specified 0.5 in services.xml
         boolean hasAnyNonIndexedCluster = false;
         for (NewDocumentType type : TopologicalDocumentTypeSorter.sort(documentDefinitions.values())) {
             ProtonConfig.Documentdb.Builder ddbB = new ProtonConfig.Documentdb.Builder();
@@ -328,6 +328,8 @@ public class ContentSearchCluster extends AbstractConfigProducer implements Prot
                     getIndexed().fillDocumentDBConfig(type.getFullName().getName(), ddbB);
                     if (tuning != null && tuning.searchNode != null && tuning.searchNode.feeding != null) {
                         ddbB.feeding.concurrency(tuning.searchNode.feeding.concurrency / 2);
+                    } else {
+                        ddbB.feeding.concurrency(builder.feeding.build().concurrency());
                     }
                 } else {
                     hasAnyNonIndexedCluster = true;
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 ec10ffa68a2..50602f27071 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.2, 0.2);
-        verifyConcurrency("streaming", "", 0.4, 0.0);
-        verifyConcurrency("store-only", "", 0.4, 0.0);
+        verifyConcurrency("index", "", 0.25, 0.25);
+        verifyConcurrency("streaming", "", 0.5, 0.0);
+        verifyConcurrency("store-only", "", 0.5, 0.0);
     }
     @Test
     public void requireThatMixedModeConcurrencyIsReflectedCorrectlyForDefault() {
-        verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.4, Arrays.asList(0.2, 0.0));
+        verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 0.5, Arrays.asList(0.25, 0.0));
     }
     @Test
     public void requireThatMixedModeConcurrencyIsReflected() {