Cluster controllers are not tied to content clusters anymore

4 files changed, 4 insertions, 32 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
index 2bd9cb09aa6..ea52f9689ff 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/Content.java
@@ -177,7 +177,7 @@ public class Content extends ConfigModel {
                 s.setVespaMallocDebugStackTrace(cluster.getRootGroup().getVespaMallocDebugStackTrace().get());
             }
         }
-        cluster.prepare(deployState);
+        cluster.prepare();
     }
 
     private void setCpuSocketAffinity() {
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 b5cae857ce0..e0d311e6df6 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
@@ -2,12 +2,10 @@
 package com.yahoo.vespa.model.content.cluster;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.model.ConfigModelContext;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.model.producer.AbstractConfigProducer;
-import com.yahoo.config.model.producer.AbstractConfigProducerRoot;
 import com.yahoo.config.provision.ClusterMembership;
 import com.yahoo.config.provision.ClusterSpec;
 import com.yahoo.config.provision.Environment;
@@ -47,7 +45,6 @@ import com.yahoo.vespa.model.content.IndexedHierarchicDistributionValidator;
 import com.yahoo.vespa.model.content.Redundancy;
 import com.yahoo.vespa.model.content.ReservedDocumentTypeNameValidator;
 import com.yahoo.vespa.model.content.StorageGroup;
-import com.yahoo.vespa.model.content.StorageNode;
 import com.yahoo.vespa.model.content.engines.PersistenceEngine;
 import com.yahoo.vespa.model.content.engines.ProtonEngine;
 import com.yahoo.vespa.model.content.storagecluster.StorageCluster;
@@ -64,7 +61,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.logging.Level;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.toList;
 
@@ -74,7 +70,7 @@ import static java.util.stream.Collectors.toList;
  * @author mostly somebody unknown
  * @author bratseth
  */
-public class ContentCluster extends AbstractConfigProducer implements
+public class ContentCluster extends AbstractConfigProducer<AbstractConfigProducer<?>> implements
                                                            DistributionConfig.Producer,
                                                            StorDistributionConfig.Producer,
                                                            StorDistributormanagerConfig.Producer,
@@ -98,14 +94,6 @@ public class ContentCluster extends AbstractConfigProducer implements
     private Integer maxNodesPerMerge;
     private final Zone zone;
 
-    /**
-     * If multitenant or a cluster controller was explicitly configured in this cluster:
-     * The cluster controller cluster of this particular content cluster.
-     *
-     * Otherwise: null - the cluster controller is shared by all content clusters and part of Admin.
-     */
-    private ClusterControllerContainerCluster clusterControllers;
-
     public enum DistributionMode { LEGACY, STRICT, LOOSE }
     private DistributionMode distributionMode;
 
@@ -419,16 +407,10 @@ public class ContentCluster extends AbstractConfigProducer implements
 
     public ClusterSpec.Id id() { return ClusterSpec.Id.from(clusterId); }
 
-    public void prepare(DeployState deployState) {
+    public void prepare() {
         search.prepare();
-
-        if (clusterControllers != null)
-            clusterControllers.prepare(deployState);
     }
 
-    /** Returns cluster controllers if this is multitenant, null otherwise */
-    public ClusterControllerContainerCluster getClusterControllers() { return clusterControllers; }
-
     public DistributionMode getDistributionMode() {
         if (distributionMode != null) return distributionMode;
         return getPersistence().getDefaultDistributionMode();
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 2b72420614d..b1b386924d1 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
@@ -38,7 +38,6 @@ import com.yahoo.yolean.Exceptions;
 import org.junit.Test;
 
 import java.io.StringReader;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -502,7 +501,6 @@ public class ModelProvisioningTest {
 
         // Check content clusters
         ContentCluster cluster = model.getContentClusters().get("bar");
-        assertNull("No own cluster controllers when hosted", cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(9, cluster.getRootGroup().getSubgroups().size());
         assertEquals("0", cluster.getRootGroup().getSubgroups().get(0).getIndex());
@@ -536,7 +534,6 @@ public class ModelProvisioningTest {
         assertThat(cluster.getRootGroup().getSubgroups().get(8).getNodes().get(2).getConfigId(), is("bar/storage/26"));
 
         cluster = model.getContentClusters().get("baz");
-        assertNull("No own cluster controllers when hosted", cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(27, cluster.getRootGroup().getSubgroups().size());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
@@ -730,7 +727,6 @@ public class ModelProvisioningTest {
 
         // Check content cluster
         ContentCluster cluster = model.getContentClusters().get("bar");
-        assertNull(cluster.getClusterControllers());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(8, cluster.getRootGroup().getSubgroups().size());
         assertEquals(8, cluster.distributionBits());
@@ -865,8 +861,6 @@ public class ModelProvisioningTest {
         assertEquals(7, model.getRoot().hostSystem().getHosts().size());
 
         // Check cluster controllers
-        assertNull(model.getContentClusters().get("foo").getClusterControllers());
-        assertNull(model.getContentClusters().get("bar").getClusterControllers());
         ClusterControllerContainerCluster clusterControllers = model.getAdmin().getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("cluster-controllers", clusterControllers.getName());
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 953c42243a6..13d02fc1fb8 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
@@ -26,7 +26,6 @@ import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainer;
 import com.yahoo.vespa.model.admin.clustercontroller.ClusterControllerContainerCluster;
 import com.yahoo.vespa.model.container.ContainerCluster;
-import com.yahoo.vespa.model.container.component.Component;
 import com.yahoo.vespa.model.content.cluster.ContentCluster;
 import com.yahoo.vespa.model.content.engines.ProtonEngine;
 import com.yahoo.vespa.model.content.utils.ContentClusterBuilder;
@@ -46,7 +45,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -533,6 +531,7 @@ public class ContentClusterTest extends ContentBaseTest {
         ContentCluster stagingNot16Bits = createWithZone(xml, new Zone(Environment.staging, RegionName.from("us-east-3")));
         assertDistributionBitsInConfig(stagingNot16Bits, 8);
     }
+
     @Test
     public void testGenerateSearchNodes()
     {
@@ -1076,7 +1075,6 @@ public class ContentClusterTest extends ContentBaseTest {
                                                           "    </documents>" +
                                                           "  </content>" +
                                                           " </services>");
-        assertNull("No own cluster controller for content", oneContentModel.getContentClusters().get("storage").getClusterControllers());
         assertNotNull("Shared cluster controller with content", oneContentModel.getAdmin().getClusterControllers());
 
         String twoContentServices = "<?xml version='1.0' encoding='UTF-8' ?>" +
@@ -1108,8 +1106,6 @@ public class ContentClusterTest extends ContentBaseTest {
         VespaModel twoContentModel = createEnd2EndOneNode(new TestProperties().setHostedVespa(true)
                                                                               .setMultitenant(true),
                                                           twoContentServices);
-        assertNull("No own cluster controller for content", twoContentModel.getContentClusters().get("storage").getClusterControllers());
-        assertNull("No own cluster controller for content", twoContentModel.getContentClusters().get("dev-null").getClusterControllers());
         assertNotNull("Shared cluster controller with content", twoContentModel.getAdmin().getClusterControllers());
 
         ClusterControllerContainerCluster clusterControllers = twoContentModel.getAdmin().getClusterControllers();