Always add an indexing docproc, also for streaming search.

4 files changed, 21 insertions, 10 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index af825ca544a..97c349aeef2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -136,7 +136,7 @@ public class MetricsProxyContainerTest {
     @Test
     void vespa_services_config_has_all_services() {
         VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent());
-        assertEquals(9, vespaServicesConfig.service().size());
+        assertEquals(10, vespaServicesConfig.service().size());
 
         for (var service : vespaServicesConfig.service()) {
             if (service.configId().equals("admin/cluster-controllers/0")) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
index 43ea0191ca5..f8adb18a2c3 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/ContentBuilderTest.java
@@ -213,7 +213,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals(1, cluster.getRoot().hostSystem().getHosts().size());
         HostResource h = cluster.getRoot().hostSystem().getHost("mockhost");
         String [] expectedServices = {
-                "logd", "configproxy", "config-sentinel", "configserver", "logserver",
+                "logd", "configproxy", "config-sentinel", "configserver", "container", "logserver",
                 "slobrok", "storagenode", "distributor", "searchnode", "transactionlogserver",
                 CLUSTERCONTROLLER_CONTAINER.serviceName, METRICS_PROXY_CONTAINER.serviceName
         };
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
index d4087c0acf9..354f2d9cf8d 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentClusterTest.java
@@ -1440,7 +1440,7 @@ public class ContentClusterTest extends ContentBaseTest {
         assertGroupsAllowedDown(2, 1, 2);
     }
 
-    private void assertIndexingDocprocEnabled(boolean indexed, boolean force, boolean expEnabled) {
+    private void assertIndexingDocprocEnabled(boolean indexed, boolean force) {
         String services = "<?xml version='1.0' encoding='UTF-8' ?>" +
                 "<services version='1.0'>" +
                 "  <container id='default' version='1.0'>" +
@@ -1456,25 +1456,32 @@ public class ContentClusterTest extends ContentBaseTest {
                 "</services>";
         VespaModel model = createEnd2EndOneNode(new TestProperties(), services);
         var searchCluster = model.getContentClusters().get("search").getSearch();
-        assertEquals(expEnabled, searchCluster.getIndexingDocproc().isPresent());
+        if (force) {
+            assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search"));
+            assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search"));
+        } else if (indexed) {
+            assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search"));
+        } else {
+            assertEquals("default", searchCluster.getIndexingDocproc().getClusterName("search"));
+        }
     }
 
     @Test
     void testIndexingDocprocEnabledWhenIndexMode()
     {
-        assertIndexingDocprocEnabled(true, false, true);
+        assertIndexingDocprocEnabled(true, false);
     }
 
     @Test
     void testIndexingDocprocNotEnabledWhenStreamingMode()
     {
-        assertIndexingDocprocEnabled(false, false, false);
+        assertIndexingDocprocEnabled(false, false);
     }
 
     @Test
     void testIndexingDocprocEnabledWhenStreamingModeAndForced()
     {
-        assertIndexingDocprocEnabled(false, true, true);
+        assertIndexingDocprocEnabled(false, true);
     }
 
     private void assertGroupsAllowedDown(int groupCount, double groupsAllowedDown, int expectedGroupsAllowedDown) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
index e37999ded12..3defaad549c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageContentTest.java
@@ -65,9 +65,13 @@ public class StorageContentTest extends ContentBaseTest {
         DocumentProtocol protocol = (DocumentProtocol) routing.getProtocols().get(0);
 
         RoutingTableSpec spec = protocol.getRoutingTableSpec();
-        assertEquals(1, spec.getNumHops());
-        assertEquals("indexing", spec.getHop(0).getName());
-        assertEquals("[DocumentRouteSelector]", spec.getHop(0).getSelector());
+        assertEquals(3, spec.getNumHops());
+        assertEquals("docproc/cluster.bar.indexing/chain.indexing", spec.getHop(0).getName());
+        assertEquals("[LoadBalancer:cluster=docproc/cluster.bar.indexing;session=chain.indexing]", spec.getHop(0).getSelector());
+        assertEquals("docproc/cluster.zoo.indexing/chain.indexing", spec.getHop(1).getName());
+        assertEquals("[LoadBalancer:cluster=docproc/cluster.zoo.indexing;session=chain.indexing]", spec.getHop(1).getSelector());
+        assertEquals("indexing", spec.getHop(2).getName());
+        assertEquals("[DocumentRouteSelector]", spec.getHop(2).getSelector());
 
         Map<String, RouteSpec> routes = new TreeMap<>();