Merge pull request #19438 from vespa-engine/bratseth/initalize-fallback-singlenode

Call initService when falling back to a single node

11 files changed, 88 insertions, 79 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..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
@@ -216,9 +216,10 @@ public class StorageGroup {
                     deployState.getDeployLogger().logApplicationPackage(Level.INFO, "'distribution-key' attribute on a content cluster's root group is ignored");
 
             GroupBuilder groupBuilder = collectGroup(owner.isHosted(), group, nodes, null, null);
-            StorageGroup storageGroup = (owner.isHosted())
-                    ? groupBuilder.buildHosted(deployState, owner, Optional.empty())
-                    : groupBuilder.buildNonHosted(deployState, owner, Optional.empty());
+            StorageGroup storageGroup = owner.isHosted()
+                                        ? groupBuilder.buildHosted(deployState, owner, Optional.empty())
+                                        : groupBuilder.buildNonHosted(deployState, owner, Optional.empty());
+
             Redundancy redundancy = redundancyBuilder.build(owner.getName(), owner.isHosted(), storageGroup.subgroups.size(),
                                                             storageGroup.getNumberOfLeafGroups(), storageGroup.countNodes(false),
                                                             maxRedundancy);
@@ -305,19 +306,25 @@ public class StorageGroup {
                     storageGroup.nodes.add(nodeBuilder.build(deployState, owner, storageGroup));
                 }
                 
-                if (parent.isEmpty() && subGroups.isEmpty() && nodeBuilders.isEmpty()) // no nodes or groups: create single node
+                if (parent.isEmpty() && subGroups.isEmpty() && nodeBuilders.isEmpty()) { // no nodes or groups: create single node
                     storageGroup.nodes.add(buildSingleNode(deployState, owner));
+                }
 
                 return 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.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;
             }
             
             /**
@@ -332,7 +339,7 @@ public class StorageGroup {
                     throw new IllegalArgumentException("Specifying individual groups is not supported on hosted applications");
                 Map<HostResource, ClusterMembership> hostMapping =
                         nodeRequirement.isPresent() ?
-                        provisionHosts(nodeRequirement.get(), owner.getStorageNodes().getClusterName(), owner.getRoot().hostSystem(), deployLogger) :
+                        provisionHosts(nodeRequirement.get(), owner.getStorageCluster().getClusterName(), owner.getRoot().hostSystem(), deployLogger) :
                         Collections.emptyMap();
 
                 Map<Optional<ClusterSpec.Group>, Map<HostResource, ClusterMembership>> hostGroups = collectAllocatedSubgroups(hostMapping);
@@ -389,7 +396,7 @@ public class StorageGroup {
             }
 
             public StorageNode build(DeployState deployState, ContentCluster parent, StorageGroup storageGroup) {
-                StorageNode sNode = new StorageNode.Builder().build(deployState, parent.getStorageNodes(), element.getXml());
+                StorageNode sNode = new StorageNode.Builder().build(deployState, parent.getStorageCluster(), element.getXml());
                 PersistenceEngine provider = parent.getPersistence().create(deployState, sNode, storageGroup, element);
                 new Distributor.Builder(clusterElement, provider).build(deployState, parent.getDistributorNodes(), element.getXml());
                 return sNode;
@@ -494,7 +501,7 @@ public class StorageGroup {
         }
 
         private static StorageNode createStorageNode(DeployState deployState, ContentCluster parent, HostResource hostResource, StorageGroup parentGroup, ClusterMembership clusterMembership) {
-            StorageNode sNode = new StorageNode(deployState.getProperties(), parent.getStorageNodes(), null, clusterMembership.index(), clusterMembership.retired());
+            StorageNode sNode = new StorageNode(deployState.getProperties(), parent.getStorageCluster(), null, clusterMembership.index(), clusterMembership.retired());
             sNode.setHostResource(hostResource);
             sNode.initService(deployState.getDeployLogger());
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
index a746dc36540..f70ab5a711d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java
@@ -428,7 +428,7 @@ public class ContentCluster extends AbstractConfigProducer<AbstractConfigProduce
 
     public DistributorCluster getDistributorNodes() { return distributorNodes; }
 
-    public StorageCluster getStorageNodes() { return storageNodes; }
+    public StorageCluster getStorageCluster() { return storageNodes; }
 
     public ClusterControllerConfig getClusterControllerConfig() { return clusterControllerConfig; }
 
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 9b9789e141c..e2fd322a4c4 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -14,6 +14,7 @@ import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.container.core.ApplicationMetadataConfig;
 import com.yahoo.search.config.QrStartConfig;
+import com.yahoo.vespa.config.content.core.StorCommunicationmanagerConfig;
 import com.yahoo.vespa.config.content.core.StorStatusConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
 import com.yahoo.vespa.model.HostResource;
@@ -30,9 +31,9 @@ import com.yahoo.vespa.model.container.ContainerCluster;
 import com.yahoo.vespa.model.content.ContentSearchCluster;
 import com.yahoo.vespa.model.content.StorageNode;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
+import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
 import com.yahoo.vespa.model.search.SearchNode;
 import com.yahoo.vespa.model.test.VespaModelTester;
-import com.yahoo.vespa.model.test.utils.ApplicationPackageUtils;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
 import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
@@ -1115,7 +1116,7 @@ public class ModelProvisioningTest {
         assertEquals(numberOfHosts, model.getRoot().hostSystem().getHosts().size());
 
         ContentCluster cluster = model.getContentClusters().get("bar");
-        assertEquals(2, cluster.getStorageNodes().getChildren().size());
+        assertEquals(2, cluster.getStorageCluster().getChildren().size());
         assertEquals(1, cluster.redundancy().effectiveInitialRedundancy());
         assertEquals(1, cluster.redundancy().effectiveFinalRedundancy());
         assertEquals(1, cluster.redundancy().effectiveReadyCopies());
@@ -1618,7 +1619,11 @@ public class ModelProvisioningTest {
 
         assertEquals("Nodes in container cluster", 1, model.getContainerClusters().get("container1").getContainers().size());
         assertEquals("Nodes in content cluster (downscaled)", 1, model.getContentClusters().get("content").getRootGroup().getNodes().size());
+
         model.getConfig(new StorStatusConfig.Builder(), "default");
+        StorageCluster storage = model.getContentClusters().get("content").getStorageCluster();
+        StorCommunicationmanagerConfig.Builder builder = new StorCommunicationmanagerConfig.Builder();
+        storage.getChildren().get("0").getConfig(builder);
     }
 
     @Test
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' />",
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 7bff4890b7e..583d0c43a9a 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
@@ -94,7 +94,7 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
-        assertEquals(1, a.getStorageNodes().getChildren().size());
+        assertEquals(1, a.getStorageCluster().getChildren().size());
     }
 
     @Test
@@ -119,7 +119,7 @@ public class ContentBuilderTest extends DomBuilderTest {
 
         assertTrue(a.getPersistence() instanceof ProtonEngine.Factory);
 
-        assertEquals(1, a.getStorageNodes().getChildren().size());
+        assertEquals(1, a.getStorageCluster().getChildren().size());
     }
 
     @Test
@@ -147,7 +147,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals("node0", a.getRootGroup().getNodes().get(0).getHostName());
 
         assertTrue(a.getPersistence() instanceof  ProtonEngine.Factory);
-        assertEquals(1, a.getStorageNodes().getChildren().size());
+        assertEquals(1, a.getStorageCluster().getChildren().size());
         assertEquals("a", a.getConfigId());
     }
 
@@ -164,7 +164,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals(7.3, s.getIndexed().getQueryTimeout(), 0.0);
 
         assertTrue(c.getPersistence() instanceof ProtonEngine.Factory);
-        assertEquals(1, c.getStorageNodes().getChildren().size());
+        assertEquals(1, c.getStorageCluster().getChildren().size());
         assertEquals("clu", c.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId()); // This is how it should look like in an ideal world.
         assertEquals("clu/storage/0", c.getRootGroup().getNodes().get(0).getConfigId()); // Due to reuse.
@@ -211,7 +211,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals(musicClusterId, ((StreamingSearchCluster)sc).getStorageRouteSpec());
 
         assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory);
-        assertEquals(1, cluster.getStorageNodes().getChildren().size());
+        assertEquals(1, cluster.getStorageCluster().getChildren().size());
 
         assertEquals(musicClusterId, cluster.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId());
@@ -269,7 +269,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         }
 
         assertTrue(cluster.getPersistence() instanceof ProtonEngine.Factory);
-        assertEquals(1, cluster.getStorageNodes().getChildren().size());
+        assertEquals(1, cluster.getStorageCluster().getChildren().size());
 
         assertEquals(musicClusterId, cluster.getConfigId());
     }
@@ -295,7 +295,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertEquals("b", s.getIndexed().getClusterName());
 
         assertTrue(b.getPersistence() instanceof ProtonEngine.Factory);
-        assertEquals(1, b.getStorageNodes().getChildren().size());
+        assertEquals(1, b.getStorageCluster().getChildren().size());
 
         assertEquals("b", b.getConfigId());
         //assertEquals("content/a/0", a.getRootGroup().getNodes().get(0).getConfigId());
@@ -323,7 +323,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
+        assertEquals(2, b.getStorageCluster().getChildren().size());
         assertTrue(b.getRootGroup().getMmapNoCoreLimit().isPresent());
         assertEquals(200000, b.getRootGroup().getMmapNoCoreLimit().get().longValue());
 
@@ -352,7 +352,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
+        assertEquals(2, b.getStorageCluster().getChildren().size());
         assertTrue(b.getRootGroup().getCoreOnOOM().isPresent());
         assertTrue(b.getRootGroup().getCoreOnOOM().get());
 
@@ -379,7 +379,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentSearchCluster s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
+        assertEquals(2, b.getStorageCluster().getChildren().size());
         assertFalse(b.getRootGroup().getCoreOnOOM().isPresent());
 
         assertThat(s.getSearchNodes().size(), is(2));
@@ -405,7 +405,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentSearchCluster s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
+        assertEquals(2, b.getStorageCluster().getChildren().size());
         assertFalse(b.getRootGroup().getMmapNoCoreLimit().isPresent());
 
         assertThat(s.getSearchNodes().size(), is(2));
@@ -431,7 +431,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentSearchCluster s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
+        assertEquals(2, b.getStorageCluster().getChildren().size());
         assertFalse(b.getRootGroup().getCoreOnOOM().isPresent());
 
         assertThat(s.getSearchNodes().size(), is(2));
@@ -459,7 +459,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentSearchCluster s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(4, b.getStorageNodes().getChildren().size());
+        assertEquals(4, b.getStorageCluster().getChildren().size());
         assertTrue(b.getRootGroup().getNoVespaMalloc().isPresent());
         assertEquals("proton", b.getRootGroup().getNoVespaMalloc().get());
         assertTrue(b.getRootGroup().getVespaMalloc().isPresent());
@@ -501,7 +501,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         ContentSearchCluster s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(4, b.getStorageNodes().getChildren().size());
+        assertEquals(4, b.getStorageCluster().getChildren().size());
         assertFalse(b.getRootGroup().getNoVespaMalloc().isPresent());
         assertFalse(b.getRootGroup().getVespaMalloc().isPresent());
         assertFalse(b.getRootGroup().getVespaMallocDebug().isPresent());
@@ -532,11 +532,11 @@ public class ContentBuilderTest extends DomBuilderTest {
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(2, b.getStorageNodes().getChildren().size());
-        assertTrue(b.getStorageNodes().getChildren().get("0").getAffinity().isPresent());
-        assertThat(b.getStorageNodes().getChildren().get("0").getAffinity().get().cpuSocket(), is(0));
-        assertTrue(b.getStorageNodes().getChildren().get("1").getAffinity().isPresent());
-        assertThat(b.getStorageNodes().getChildren().get("1").getAffinity().get().cpuSocket(), is(1));
+        assertEquals(2, b.getStorageCluster().getChildren().size());
+        assertTrue(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent());
+        assertThat(b.getStorageCluster().getChildren().get("0").getAffinity().get().cpuSocket(), is(0));
+        assertTrue(b.getStorageCluster().getChildren().get("1").getAffinity().isPresent());
+        assertThat(b.getStorageCluster().getChildren().get("1").getAffinity().get().cpuSocket(), is(1));
 
         assertThat(s.getSearchNodes().size(), is(2));
         assertTrue(s.getSearchNodes().get(0).getAffinity().isPresent());
@@ -567,7 +567,7 @@ public class ContentBuilderTest extends DomBuilderTest {
         s = b.getSearch();
         assertTrue(s.hasIndexedCluster());
         assertNotNull(s.getIndexed());
-        assertEquals(6, b.getStorageNodes().getChildren().size());
+        assertEquals(6, b.getStorageCluster().getChildren().size());
         assertTrue(b.getRootGroup().useCpuSocketAffinity());
 
         assertThat(s.getSearchNodes().size(), is(6));
@@ -585,12 +585,12 @@ public class ContentBuilderTest extends DomBuilderTest {
         assertThat(s.getSearchNodes().get(5).getAffinity().get().cpuSocket(),is (0));
 
         // TODO: Only needed for the search nodes anyway?
-        assertFalse(b.getStorageNodes().getChildren().get("0").getAffinity().isPresent());
-        assertFalse(b.getStorageNodes().getChildren().get("1").getAffinity().isPresent());
-        assertFalse(b.getStorageNodes().getChildren().get("2").getAffinity().isPresent());
-        assertFalse(b.getStorageNodes().getChildren().get("3").getAffinity().isPresent());
-        assertFalse(b.getStorageNodes().getChildren().get("4").getAffinity().isPresent());
-        assertFalse(b.getStorageNodes().getChildren().get("5").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("0").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("1").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("2").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("3").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("4").getAffinity().isPresent());
+        assertFalse(b.getStorageCluster().getChildren().get("5").getAffinity().isPresent());
         //assertThat(b.getStorageNodes().getChildren().get("0").getAffinity().get().cpuSocket(), is(0));
         //assertThat(b.getStorageNodes().getChildren().get("1").getAffinity().get().cpuSocket(), is(1));
         //assertThat(b.getStorageNodes().getChildren().get("2").getAffinity().get().cpuSocket(), is(2));
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 7f006cdccd9..fccff508b4e 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
@@ -553,15 +553,15 @@ public class ContentClusterTest extends ContentBaseTest {
 
         {
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
-            cluster.getStorageNodes().getConfig(builder);
-            cluster.getStorageNodes().getChildren().get("0").getConfig(builder);
+            cluster.getStorageCluster().getConfig(builder);
+            cluster.getStorageCluster().getChildren().get("0").getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
         }
 
         {
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
-            cluster.getStorageNodes().getConfig(builder);
-            cluster.getStorageNodes().getChildren().get("1").getConfig(builder);
+            cluster.getStorageCluster().getConfig(builder);
+            cluster.getStorageCluster().getChildren().get("1").getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
         }
     }
@@ -635,8 +635,8 @@ public class ContentClusterTest extends ContentBaseTest {
 
         {
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
-            cluster.getStorageNodes().getConfig(builder);
-            cluster.getStorageNodes().getChildren().get("0").getConfig(builder);
+            cluster.getStorageCluster().getConfig(builder);
+            cluster.getStorageCluster().getChildren().get("0").getConfig(builder);
 
             StorServerConfig config = new StorServerConfig(builder);
 
@@ -696,7 +696,7 @@ public class ContentClusterTest extends ContentBaseTest {
         assertEquals("partofsum", config.consumer(5).removedtags(1));
         assertEquals(0, config.consumer(5).tags().size());
 
-        cluster.getStorageNodes().getConfig(builder);
+        cluster.getStorageCluster().getConfig(builder);
         config = new MetricsmanagerConfig(builder);
         assertEquals(6, config.consumer().size());
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
index 51d0afc1f93..2d54791cc2c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/GenericConfigTest.java
@@ -55,7 +55,7 @@ public class GenericConfigTest {
 
     @Test
     public void config_override_on_root_is_visible_on_storage_cluster() {
-        StorageCluster cluster = model.getContentClusters().get("storage").getStorageNodes();
+        StorageCluster cluster = model.getContentClusters().get("storage").getStorageCluster();
 
         StorFilestorConfig config = model.getConfig(StorFilestorConfig.class, cluster.getConfigId());
         assertThat(config.num_threads(), is(7));
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index 5d4756c430d..49518bb749c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -179,8 +179,8 @@ public class IndexedTest extends ContentBaseTest {
         assertFalse(s.getSearch().hasIndexedCluster());
 
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
-        s.getStorageNodes().getConfig(builder);
-        s.getStorageNodes().getChildren().get("3").getConfig(builder);
+        s.getStorageCluster().getConfig(builder);
+        s.getStorageCluster().getChildren().get("3").getConfig(builder);
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index fd85ea3d024..3e59a17d1a5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -66,7 +66,7 @@ public class StorageClusterTest {
         ContentCluster cluster = ContentClusterUtils.createCluster(xml, root);
 
         root.freezeModelTopology();
-        return cluster.getStorageNodes();
+        return cluster.getStorageCluster();
     }
 
     private static String group() {
@@ -328,9 +328,9 @@ public class StorageClusterTest {
         ContentCluster cluster = ContentClusterUtils.createCluster(xml, new MockRoot());
 
         for (int i = 0; i < 3; ++i) {
-            StorageNode node = cluster.getStorageNodes().getChildren().get("" + i);
+            StorageNode node = cluster.getStorageCluster().getChildren().get("" + i);
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
-            cluster.getStorageNodes().getConfig(builder);
+            cluster.getStorageCluster().getConfig(builder);
             node.getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
             assertEquals(1.0 + (double)i * 0.5, config.node_capacity(), 0.001);
@@ -341,11 +341,11 @@ public class StorageClusterTest {
     public void testRootFolder() {
         ContentCluster cluster = ContentClusterUtils.createCluster(cluster("storage", ""), new MockRoot());
 
-        StorageNode node = cluster.getStorageNodes().getChildren().get("0");
+        StorageNode node = cluster.getStorageCluster().getChildren().get("0");
 
         {
             StorServerConfig.Builder builder = new StorServerConfig.Builder();
-            cluster.getStorageNodes().getConfig(builder);
+            cluster.getStorageCluster().getConfig(builder);
             node.getConfig(builder);
             StorServerConfig config = new StorServerConfig(builder);
             assertEquals(getDefaults().underVespaHome("var/db/vespa/search/storage/storage/0"), config.root_folder());
@@ -378,7 +378,7 @@ public class StorageClusterTest {
         ContentCluster cluster = ContentClusterUtils.createCluster(xml, new MockRoot());
 
         PersistenceConfig.Builder builder = new PersistenceConfig.Builder();
-        cluster.getStorageNodes().getConfig(builder);
+        cluster.getStorageCluster().getConfig(builder);
 
         PersistenceConfig config = new PersistenceConfig(builder);
         assertTrue(config.fail_partition_on_error());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
index b9495d45e08..4ab7b44f246 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageGroupTest.java
@@ -32,9 +32,9 @@ public class StorageGroupTest {
                         "</content>"
         );
 
-        assertEquals("content", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("clustertype"));
-        assertEquals("storage", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("clustername"));
-        assertEquals("0", cluster.getStorageNodes().getChildren().get("0").getServicePropertyString("index"));
+        assertEquals("content", cluster.getStorageCluster().getChildren().get("0").getServicePropertyString("clustertype"));
+        assertEquals("storage", cluster.getStorageCluster().getChildren().get("0").getServicePropertyString("clustername"));
+        assertEquals("0", cluster.getStorageCluster().getChildren().get("0").getServicePropertyString("index"));
 
         assertEquals("content", cluster.getDistributorNodes().getChildren().get("0").getServicePropertyString("clustertype"));
         assertEquals("storage", cluster.getDistributorNodes().getChildren().get("0").getServicePropertyString("clustername"));
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
index e346a766738..cd5a89d2e2f 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/testutil/DocumentSourceSearcher.java
@@ -38,9 +38,9 @@ public class DocumentSourceSearcher extends Searcher {
     // TODO: update tests to explicitly set hits, so that the default results can be removed entirely.
     private Result defaultFilledResult;
 
-    private Map<Query, Result> completelyFilledResults = new HashMap<>();
-    private Map<Query, Result> unFilledResults = new HashMap<>();
-    private Map<String, Set<String>> summaryClasses = new HashMap<>();
+    private final Map<Query, Result> completelyFilledResults = new HashMap<>();
+    private final Map<Query, Result> unFilledResults = new HashMap<>();
+    private final Map<String, Set<String>> summaryClasses = new HashMap<>();
 
     private int queryCount;