Revert "Revert "Revert "Create a resourcepool so that we do not need to reconnect to content …"""

5 files changed, 22 insertions, 60 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
index a466dabe984..c671749cff0 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/ConfigProducerGroup.java
@@ -4,12 +4,7 @@ package com.yahoo.vespa.model.container.component;
 import com.yahoo.component.ComponentId;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
+import java.util.*;
 
 /**
  * A group of config producers that have a component id.
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
index 6048f3d62f2..e19d81e7fb2 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/ContainerSearch.java
@@ -8,7 +8,6 @@ import com.yahoo.search.pagetemplates.PageTemplatesConfig;
 import com.yahoo.search.query.profile.config.QueryProfilesConfig;
 import com.yahoo.vespa.configdefinition.IlscriptsConfig;
 import com.yahoo.vespa.model.container.ApplicationContainerCluster;
-import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.container.component.ContainerSubsystem;
 import com.yahoo.vespa.model.container.search.searchchain.LocalProvider;
 import com.yahoo.vespa.model.container.search.searchchain.SearchChains;
@@ -59,11 +58,7 @@ public class ContainerSearch extends ContainerSubsystem<SearchChains>
     private void initializeDispatchers(Collection<AbstractSearchCluster> searchClusters) {
         for (AbstractSearchCluster searchCluster : searchClusters) {
             if ( ! ( searchCluster instanceof IndexedSearchCluster)) continue;
-            Component dispatcher = new DispatcherComponent((IndexedSearchCluster)searchCluster);
-            var rpcResoucePool = new RpcResourcePoolComponent();
-            dispatcher.inject(rpcResoucePool);
-            dispatcher.addComponent(rpcResoucePool);
-            owningCluster.addComponent(dispatcher);
+            owningCluster.addComponent(new DispatcherComponent((IndexedSearchCluster)searchCluster));
         }
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
index a196623cb92..704188e80e8 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/search/DispatcherComponent.java
@@ -26,7 +26,7 @@ public class DispatcherComponent extends Component<DispatcherComponent, Componen
     private static ComponentModel toComponentModel(IndexedSearchCluster indexedSearchCluster) {
         String dispatcherComponentId = "dispatcher." + indexedSearchCluster.getClusterName(); // used by ClusterSearcher
         return new ComponentModel(dispatcherComponentId,
-                                  com.yahoo.search.dispatch.Dispatcher.class.getName(),
+                                  "com.yahoo.search.dispatch.Dispatcher",
                                   BundleMapper.searchAndDocprocBundle,
                                   null);
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java b/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java
deleted file mode 100644
index 0450809ee51..00000000000
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/search/RpcResourcePoolComponent.java
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2020 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.model.container.search;
-
-import com.yahoo.osgi.provider.model.ComponentModel;
-import com.yahoo.vespa.model.container.component.Component;
-import com.yahoo.vespa.model.container.xml.BundleMapper;
-
-public class RpcResourcePoolComponent extends Component<RpcResourcePoolComponent, ComponentModel> {
-
-    public RpcResourcePoolComponent() {
-        super(toComponentModel());
-    }
-
-    private static ComponentModel toComponentModel() {
-        String className = com.yahoo.search.dispatch.rpc.RpcResourcePool.class.getName();
-        return new ComponentModel(className, className, BundleMapper.searchAndDocprocBundle, null);
-    }
-}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
index e5bc0644e10..1c4e005cb67 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/test/SearchClusterTest.java
@@ -18,15 +18,12 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.search.AbstractSearchCluster;
+import com.yahoo.vespa.model.search.SearchCluster;
 import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
+import static org.junit.Assert.*;
 
 /**
  * Unit tests for SearchCluster. Please use this instead of SearchModelTestCase if possible and
@@ -163,30 +160,23 @@ public class SearchClusterTest {
         AbstractSearchCluster searchCluster2 = model.getSearchClusters().get(xbulkIndex);
         assertEquals("xbulk", searchCluster2.getClusterName());
 
-        verifyDispatch(model, containerCluster1, "normal", "node2host");
-        verifyDispatch(model, containerCluster1, "xbulk", "node0host");
-    }
-
-    private void verifyDispatch(VespaModel model, ContainerCluster containerCluster, String cluster, String host) {
-        Component<?,?> dispatcher = (Component<?, ?>)containerCluster.getComponentsMap().get(new ComponentId("dispatcher." + cluster));
-        assertNotNull(dispatcher);
-        assertEquals("dispatcher." + cluster, dispatcher.getComponentId().stringValue());
-        assertEquals("com.yahoo.search.dispatch.Dispatcher", dispatcher.getClassId().stringValue());
-        assertEquals("j1/component/dispatcher." + cluster, dispatcher.getConfigId());
-        DispatchConfig.Builder dispatchConfigBuilder = new DispatchConfig.Builder();
-        model.getConfig(dispatchConfigBuilder, dispatcher.getConfigId());
-        assertEquals(host, dispatchConfigBuilder.build().node(0).host());
-
-        assertTrue(dispatcher.getInjectedComponentIds().contains("com.yahoo.search.dispatch.rpc.RpcResourcePool"));
-
-        Component<?,?> rpcResourcePool = (Component<?, ?>)dispatcher.getChildren().get("com.yahoo.search.dispatch.rpc.RpcResourcePool");
-        assertNotNull(rpcResourcePool);
-        assertEquals("com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getComponentId().stringValue());
-        assertEquals("com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getClassId().stringValue());
-        assertEquals("j1/component/dispatcher." + cluster + "/com.yahoo.search.dispatch.rpc.RpcResourcePool", rpcResourcePool.getConfigId());
-        dispatchConfigBuilder = new DispatchConfig.Builder();
-        model.getConfig(dispatchConfigBuilder, rpcResourcePool.getConfigId());
-        assertEquals(host, dispatchConfigBuilder.build().node(0).host());
+        Component<?,?> normalDispatcher = (Component<?, ?>)containerCluster1.getComponentsMap().get(new ComponentId("dispatcher.normal"));
+        assertNotNull(normalDispatcher);
+        assertEquals("dispatcher.normal", normalDispatcher.getComponentId().stringValue());
+        assertEquals("com.yahoo.search.dispatch.Dispatcher", normalDispatcher.getClassId().stringValue());
+        assertEquals("j1/component/dispatcher.normal", normalDispatcher.getConfigId());
+        DispatchConfig.Builder normalDispatchConfigBuilder = new DispatchConfig.Builder();
+        model.getConfig(normalDispatchConfigBuilder, "j1/component/dispatcher.normal");
+        assertEquals("node2host", normalDispatchConfigBuilder.build().node(0).host());
+
+        Component<?,?> xbulkDispatcher = (Component<?, ?>)containerCluster1.getComponentsMap().get(new ComponentId("dispatcher.xbulk"));
+        assertNotNull(xbulkDispatcher);
+        assertEquals("dispatcher.xbulk", xbulkDispatcher.getComponentId().stringValue());
+        assertEquals("com.yahoo.search.dispatch.Dispatcher", xbulkDispatcher.getClassId().stringValue());
+        assertEquals("j1/component/dispatcher.xbulk", xbulkDispatcher.getConfigId());
+        DispatchConfig.Builder xbulkDispatchConfigBuilder = new DispatchConfig.Builder();
+        model.getConfig(xbulkDispatchConfigBuilder, "j1/component/dispatcher.xbulk");
+        assertEquals("node0host", xbulkDispatchConfigBuilder.build().node(0).host());
     }
 
 }