Select 3 (i.e all) hosts by index

2 files changed, 15 insertions, 15 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 1ec56fe529a..30e5962b3b3 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
@@ -356,7 +356,7 @@ public class ContentCluster extends AbstractConfigProducer implements
             List<HostResource> hostsByIndex = drawContentHostsRecursively(count, true, rootGroup);
             // if (hosts.size() < count) // supply with containers TODO: Currently disabled due to leading to topology change problems
             //     hosts.addAll(drawContainerHosts(count - hosts.size(), containers, new HashSet<>(hosts)));
-            List<HostResource> hosts = HostResource.pickHosts(hostsByName, hostsByIndex, count, 2);
+            List<HostResource> hosts = HostResource.pickHosts(hostsByName, hostsByIndex, count, 3);
             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 f9585224bd6..32bbc3621da 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
@@ -416,9 +416,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default28", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default54", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default51", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default54", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default51", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default48", clusterControllers.getContainers().get(2).getHostName());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(9, cluster.getRootGroup().getSubgroups().size());
         assertThat(cluster.getRootGroup().getSubgroups().get(0).getIndex(), is("0"));
@@ -508,9 +508,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default08", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default07", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default08", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default07", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default06", clusterControllers.getContainers().get(2).getHostName());
         assertEquals(0, cluster.getRootGroup().getNodes().size());
         assertEquals(8, cluster.getRootGroup().getSubgroups().size());
         assertEquals(8, cluster.distributionBits());
@@ -568,8 +568,8 @@ public class ModelProvisioningTest {
         assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
         assertEquals("default02", clusterControllers.getContainers().get(1).getHostName());
         assertEquals("default04", clusterControllers.getContainers().get(2).getHostName());
-        assertEquals("default05", clusterControllers.getContainers().get(3).getHostName());
-        assertEquals("default09", clusterControllers.getContainers().get(4).getHostName());
+        assertEquals("default09", clusterControllers.getContainers().get(3).getHostName());
+        assertEquals("default08", clusterControllers.getContainers().get(4).getHostName());
         assertEquals("default09", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(0).getHostName());
         assertEquals("default08", cluster.getRootGroup().getSubgroups().get(0).getNodes().get(1).getHostName());
         assertEquals("default06", cluster.getRootGroup().getSubgroups().get(1).getNodes().get(0).getHostName());
@@ -605,9 +605,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals("We get the closest odd number", 3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("default01", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("default08", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("default06", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("default08", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("default06", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("default04", clusterControllers.getContainers().get(2).getHostName());
     }
 
     @Test
@@ -672,9 +672,9 @@ public class ModelProvisioningTest {
         ContainerCluster clusterControllers = cluster.getClusterControllers();
         assertEquals(3, clusterControllers.getContainers().size());
         assertEquals("bar-controllers", clusterControllers.getName());
-        assertEquals("Skipping retired default09", "default01", clusterControllers.getContainers().get(0).getHostName());
-        assertEquals("Skipping retired default06", "default08", clusterControllers.getContainers().get(1).getHostName());
-        assertEquals("Skipping retired default03", "default05", clusterControllers.getContainers().get(2).getHostName());
+        assertEquals("Skipping retired default09", "default08", clusterControllers.getContainers().get(0).getHostName());
+        assertEquals("Skipping retired default06", "default05", clusterControllers.getContainers().get(1).getHostName());
+        assertEquals("Skipping retired default03", "default02", clusterControllers.getContainers().get(2).getHostName());
     }
 
     @Test