Merge branch 'master' into bratseth/initalize-fallback-singlenode

1 files changed, 10 insertions, 6 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 e54a078cbe6..fea36eaeb15 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
@@ -315,12 +315,16 @@ public class StorageGroup {
 
             private StorageNode buildSingleNode(DeployState deployState, ContentCluster parent) {
                 int distributionKey = 0;
-                StorageNode sNode = new StorageNode(deployState.getProperties(), parent.getStorageCluster(), 1.0, distributionKey , false);
-                sNode.setHostResource(parent.hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
-                sNode.initService(deployLogger);
-                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.getStorageCluster(), 1.0, distributionKey , false);
+                searchNode.setHostResource(parent.hostSystem().getHost(Container.SINGLENODE_CONTAINER_SERVICESPEC));
+                PersistenceEngine provider = parent.getPersistence().create(deployState, searchNode, storageGroup, null);
+                searchNode.initService(deployLogger);
+
+                Distributor distributor = new Distributor(deployState.getProperties(), parent.getDistributorNodes(), distributionKey, null, provider);
+                distributor.setHostResource(searchNode.getHostResource());
+                distributor.initService(deployLogger);
+                return searchNode;
             }
             
             /**