diff options
author | gjoranv <gv@yahoo-inc.com> | 2016-07-12 12:52:18 +0200 |
---|---|---|
committer | gjoranv <gv@yahoo-inc.com> | 2016-07-12 12:55:40 +0200 |
commit | c1b0d4d480397675f51d56f562e76c5054c9ff33 (patch) | |
tree | ddd2e076624da605359532f93b3d6152f6ff1726 | |
parent | efb34e0689646f5540299712303e95e3dd47c81c (diff) |
Disable drawing clustercontrollers from container hosts
VESPA-4007
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/content/cluster/ContentCluster.java | 4 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 8 |
2 files changed, 7 insertions, 5 deletions
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 34cc31921c9..80f0791d5d8 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 @@ -320,8 +320,8 @@ public class ContentCluster extends AbstractConfigProducer implements StorDistri private List<HostResource> drawControllerHosts(int count, StorageGroup rootGroup, Collection<ContainerModel> containers) { List<HostResource> hosts = drawContentHostsRecursively(count, rootGroup); - if (hosts.size() < count) // supply with containers - hosts.addAll(drawContainerHosts(count - hosts.size(), containers, new HashSet<>(hosts))); +// if (hosts.size() < count) // supply with containers +// hosts.addAll(drawContainerHosts(count - hosts.size(), containers, new HashSet<>(hosts))); if (hosts.size() % 2 == 0) // ZK clusters of even sizes are less available (even in the size=2 case) hosts = hosts.subList(0, hosts.size()-1); return hosts; 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 1c7940fdc8f..b66cb25e18a 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 @@ -20,6 +20,7 @@ import com.yahoo.vespa.model.container.Container; import com.yahoo.vespa.model.container.ContainerCluster; import com.yahoo.vespa.model.search.Dispatch; import com.yahoo.vespa.model.test.VespaModelTester; +import org.junit.Ignore; import org.junit.Test; import com.yahoo.config.model.deploy.DeployState; @@ -458,7 +459,7 @@ public class ModelProvisioningTest { ContentCluster cluster = model.getContentClusters().get("bar"); ContainerCluster clusterControllers = cluster.getClusterControllers(); - assertEquals(5, clusterControllers.getContainers().size()); + assertEquals(1, clusterControllers.getContainers().size()); // TODO: Expected 5 with this feature reactivated } public void testClusterControllersAreNotPlacedOnRetiredNodes() { @@ -625,9 +626,10 @@ public class ModelProvisioningTest { ContentCluster cluster = model.getContentClusters().get("bar"); ContainerCluster clusterControllers = cluster.getClusterControllers(); - assertEquals(3, clusterControllers.getContainers().size()); + assertEquals(1, clusterControllers.getContainers().size()); // TODO: Expected 3 with this feature reactivated } + @Ignore // TODO: unignore when feature is enabled again @Test public void test2ContentNodesOn2ClustersWithContainerClusterProducesMixedClusterControllerCluster() throws ParseException { String services = @@ -661,7 +663,7 @@ public class ModelProvisioningTest { ContentCluster cluster1 = model.getContentClusters().get("content1"); ContainerCluster clusterControllers1 = cluster1.getClusterControllers(); - assertEquals(3, clusterControllers1.getContainers().size()); + assertEquals(1, clusterControllers1.getContainers().size()); assertEquals("content1-node0", clusterControllers1.getContainers().get(0).getHostName()); assertEquals("content1-node1", clusterControllers1.getContainers().get(1).getHostName()); assertEquals("container-node0", clusterControllers1.getContainers().get(2).getHostName()); |