Assign host and call initServices on distributor

2 files changed, 21 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
index 0997f29729f..876b477b6b7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/StorageGroup.java
@@ -313,11 +313,14 @@ public class StorageGroup {
 
             private StorageNode buildSingleNode(DeployState deployState, ContentCluster parent) {
                 int distributionKey = 0;
-                StorageNode sNode = new StorageNode(deployState.getProperties(), parent.getStorageNodes(), 1.0, distributionKey , false);
-                sNode.setHostResource(parent.hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
-                PersistenceEngine provider = parent.getPersistence().create(deployState, sNode, storageGroup, null);
-                new Distributor(deployState.getProperties(), parent.getDistributorNodes(), distributionKey, null, provider);
-                return sNode;
+                StorageNode searchNode = new StorageNode(deployState.getProperties(), parent.getStorageNodes(), 1.0, distributionKey , false);
+                searchNode.setHostResource(parent.hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
+                PersistenceEngine provider = parent.getPersistence().create(deployState, searchNode, storageGroup, null);
+
+                Distributor distributor = new Distributor(deployState.getProperties(), parent.getDistributorNodes(), distributionKey, null, provider);
+                distributor.setHostResource(searchNode.getHostResource());
+                distributor.initService(deployLogger);
+                return searchNode;
             }
             
             /**
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 3f211a595b9..a84f73dfd5a 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
@@ -37,7 +37,7 @@ public class MetricsProxyContainerTest {
         var tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
 
-        VespaModel model = tester.createModel(servicesWithManyNodes(), true);
+        VespaModel model = tester.createModel(hostedServicesWithManyNodes(), true);
         assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         for (var host : model.hostSystem().getHosts()) {
@@ -56,7 +56,7 @@ public class MetricsProxyContainerTest {
         var tester = new VespaModelTester();
         tester.addHosts(numberOfHosts);
 
-        VespaModel model = tester.createModel(servicesWithManyNodes(), true);
+        VespaModel model = tester.createModel(hostedServicesWithManyNodes(), true);
         assertThat(model.getRoot().hostSystem().getHosts().size(), is(numberOfHosts));
 
         for (var host : model.hostSystem().getHosts()) {
@@ -71,7 +71,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void http_server_is_running_on_expected_port() {
-        VespaModel model = getModel(servicesWithContent(), self_hosted);
+        VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
         MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
         assertEquals(19092, container.getSearchPort());
         assertEquals(19092, container.getHealthPort());
@@ -82,7 +82,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void metrics_rpc_server_is_running_on_expected_port() {
-        VespaModel model = getModel(servicesWithContent(), self_hosted);
+        VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
         MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
 
         int offset = 3;
@@ -96,7 +96,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void admin_rpc_server_is_running() {
-        VespaModel model = getModel(servicesWithContent(), self_hosted);
+        VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
         MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
 
         int offset = 2;
@@ -107,7 +107,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void preload_is_empty() {
-        VespaModel model = getModel(servicesWithContent(), self_hosted);
+        VespaModel model = getModel(hostedServicesWithContent(), self_hosted);
         MetricsProxyContainer container = (MetricsProxyContainer)model.id2producer().get(CONTAINER_CONFIG_ID);
 
         assertEquals("", container.getPreLoad());
@@ -115,7 +115,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void hosted_application_propagates_node_dimensions() {
-        String services = servicesWithContent();
+        String services = hostedServicesWithContent();
         VespaModel hostedModel = getModel(services, hosted);
         assertEquals(4, hostedModel.getHosts().size());
         String configId = containerConfigId(hostedModel, hosted);
@@ -127,7 +127,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void metrics_v2_handler_is_set_up_with_node_info_config() {
-        String services = servicesWithContent();
+        String services = hostedServicesWithContent();
         VespaModel hostedModel = getModel(services, hosted);
 
         var container = (MetricsProxyContainer)hostedModel.id2producer().get(containerConfigId(hostedModel, hosted));
@@ -143,8 +143,8 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void vespa_services_config_has_all_services() {
-        VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(servicesWithContent());
-        assertEquals(7, vespaServicesConfig.service().size());
+        VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent());
+        assertEquals(8, vespaServicesConfig.service().size());
 
         for (var service : vespaServicesConfig.service()) {
             if (service.configId().equals("admin/cluster-controllers/0")) {
@@ -158,7 +158,7 @@ public class MetricsProxyContainerTest {
 
     @Test
     public void vespa_services_config_has_service_dimensions() {
-        VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(servicesWithContent());
+        VespaServicesConfig vespaServicesConfig = getVespaServicesConfig(hostedServicesWithContent());
         for (var service : vespaServicesConfig.service()) {
             if (service.configId().equals("admin/cluster-controllers/0")) {
                 assertEquals(1, service.dimension().size());
@@ -169,7 +169,7 @@ public class MetricsProxyContainerTest {
     }
 
 
-    private static String servicesWithManyNodes() {
+    private static String hostedServicesWithManyNodes() {
         return String.join("\n",
                            "<services>",
                            "    <container version='1.0' id='foo'>",
@@ -182,12 +182,9 @@ public class MetricsProxyContainerTest {
                            "</services>");
     }
 
-    private static String servicesWithContent() {
+    private static String hostedServicesWithContent() {
         return String.join("\n",
                            "<services>",
-                           "    <admin version='2.0'>",
-                           "        <adminserver hostalias='node1'/>",
-                           "    </admin>",
                            "    <content version='1.0' id='my-content'>",
                            "        <documents />",
                            "        <nodes count='1' />",