diff options
3 files changed, 20 insertions, 36 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 8b9f32fa135..2d01f9d903e 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 @@ -381,18 +381,11 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster> hasAnyNonIndexedCluster = true; ddbB.inputdoctypename(type.getFullName().getName()) .configid(findStreamingCluster(docTypeName).get().getDocumentDBConfigId()) - .mode(ProtonConfig.Documentdb.Mode.Enum.STREAMING) - .feeding.concurrency(0.0); + .mode(ProtonConfig.Documentdb.Mode.Enum.STREAMING); } else if (hasIndexingModeIndexed(type)) { getIndexed().fillDocumentDBConfig(type.getFullName().getName(), ddbB); - if (tuning != null && tuning.searchNode != null && tuning.searchNode.feeding != null) { - ddbB.feeding.concurrency(tuning.searchNode.feeding.concurrency); - } else { - ddbB.feeding.concurrency(defaultFeedConcurrency); - } } else { hasAnyNonIndexedCluster = true; - ddbB.feeding.concurrency(0.0); ddbB.mode(ProtonConfig.Documentdb.Mode.Enum.STORE_ONLY); } if (globalDocType) { 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 059c1ceb208..d541a6422e7 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 @@ -42,21 +42,21 @@ public class DocumentDatabaseTestCase { @Test public void requireThatConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency("index", "", 0.50, 0.50); - verifyConcurrency("streaming", "", 1.0, 0.0); - verifyConcurrency("store-only", "", 1.0, 0.0); + verifyConcurrency("index", "", 0.50); + verifyConcurrency("streaming", "", 1.0); + verifyConcurrency("store-only", "", 1.0); } @Test public void requireThatFeatureFlagConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency("index", "", 0.30, 0.30, 0.3); - verifyConcurrency("streaming", "", 0.6, 0.0, 0.3); - verifyConcurrency("store-only", "", 0.8, 0.0, 0.4); + verifyConcurrency("index", "", 0.30, 0.3); + verifyConcurrency("streaming", "", 0.6, 0.3); + verifyConcurrency("store-only", "", 0.8, 0.4); } @Test public void requireThatMixedModeConcurrencyIsReflectedCorrectlyForDefault() { - verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 1.0, Arrays.asList(0.50, 0.0)); + verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), "", 1.0); } @Test @@ -64,7 +64,7 @@ public class DocumentDatabaseTestCase { String feedTuning = "<feeding>" + " <concurrency>0.7</concurrency>" + "</feeding>\n"; - verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), feedTuning, 0.7, Arrays.asList(0.7, 0.0)); + verifyConcurrency(Arrays.asList(DocType.create("a", "index"), DocType.create("b", "streaming")), feedTuning, 0.7); } @Test @@ -72,25 +72,24 @@ public class DocumentDatabaseTestCase { String feedTuning = "<feeding>" + " <concurrency>0.7</concurrency>" + "</feeding>\n"; - verifyConcurrency("index", feedTuning, 0.7, 0.7); - verifyConcurrency("streaming", feedTuning, 0.7, 0.0); - verifyConcurrency("store-only", feedTuning, 0.7, 0.0); + verifyConcurrency("index", feedTuning, 0.7); + verifyConcurrency("streaming", feedTuning, 0.7); + verifyConcurrency("store-only", feedTuning, 0.7); } - private void verifyConcurrency(String mode, String xmlTuning, double global, double local, double featureFlagConcurrency) { - verifyConcurrency(Arrays.asList(DocType.create("a", mode)), xmlTuning, global, Arrays.asList(local), featureFlagConcurrency); + private void verifyConcurrency(String mode, String xmlTuning, double expectedConcurrency, double featureFlagConcurrency) { + verifyConcurrency(Arrays.asList(DocType.create("a", mode)), xmlTuning, expectedConcurrency, featureFlagConcurrency); } - private void verifyConcurrency(String mode, String xmlTuning, double global, double local) { - verifyConcurrency(Arrays.asList(DocType.create("a", mode)), xmlTuning, global, Arrays.asList(local), null); + private void verifyConcurrency(String mode, String xmlTuning, double expectedConcurrency) { + verifyConcurrency(Arrays.asList(DocType.create("a", mode)), xmlTuning, expectedConcurrency, null); } - private void verifyConcurrency(List<DocType> nameAndModes, String xmlTuning, double global, List<Double> local) { - verifyConcurrency(nameAndModes, xmlTuning, global, local, null); + private void verifyConcurrency(List<DocType> nameAndModes, String xmlTuning, double expectedConcurrency) { + verifyConcurrency(nameAndModes, xmlTuning, expectedConcurrency, null); } - private void verifyConcurrency(List<DocType> nameAndModes, String xmlTuning, double global, List<Double> local, Double featureFlagConcurrency) { - assertEquals(nameAndModes.size(), local.size()); + private void verifyConcurrency(List<DocType> nameAndModes, String xmlTuning, double expectedConcurrency, Double featureFlagConcurrency) { TestProperties properties = new TestProperties(); if (featureFlagConcurrency != null) { properties.setFeedConcurrency(featureFlagConcurrency); @@ -99,11 +98,7 @@ public class DocumentDatabaseTestCase { VespaModel model = tester.createModel(nameAndModes, xmlTuning, new DeployState.Builder().properties(properties)); ContentSearchCluster contentSearchCluster = model.getContentClusters().get("test").getSearch(); ProtonConfig proton = tester.getProtonConfig(contentSearchCluster); - assertEquals(global, proton.feeding().concurrency(), SMALL); - assertEquals(local.size(), proton.documentdb().size()); - for (int i = 0; i < local.size(); i++) { - assertEquals(local.get(i), proton.documentdb(i).feeding().concurrency(), SMALL); - } + assertEquals(expectedConcurrency, proton.feeding().concurrency(), SMALL); } @Test diff --git a/searchcore/src/vespa/searchcore/config/proton.def b/searchcore/src/vespa/searchcore/config/proton.def index 4edaa4a6757..bb664ea1743 100644 --- a/searchcore/src/vespa/searchcore/config/proton.def +++ b/searchcore/src/vespa/searchcore/config/proton.def @@ -294,10 +294,6 @@ documentdb[].configid string documentdb[].visibilitydelay double default=0.0 ## Whether this document type is globally distributed or not. documentdb[].global bool default=false -## A number between 0.0 and 1.0 that specifies the concurrency when handling feed operations. -## Deprecated and ignored after the shared field writer is used across all document dbs. See feeding.concurrency for details. -## TODO: Remove this setting when the config-model is no longer using it. -documentdb[].feeding.concurrency double default=0.2 ## Minimum initial size for any per document tables. documentdb[].allocation.initialnumdocs long default=1024 |