aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-11-22 12:44:54 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2017-11-22 12:44:54 +0100
commit69240b256a45d246c459de2050d8fc2ac552a991 (patch)
tree0d3069d06fdc2ca9e7f3eeba8e6c7c4681e351ad /config-model
parent0bb6d1edd6b505fb57ba47f80d49918eecdb47df (diff)
Pick 1 slobrok by index
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java2
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
index fa6fa805f1e..f33c86134cb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java
@@ -122,7 +122,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase {
.filter(container -> retired == container.isRetired())
.map(Container::getHostResource)
.collect(Collectors.toList());
- return HostResource.pickHosts(hosts, count, 0);
+ return HostResource.pickHosts(hosts, count, 1);
}
private void createLogserver(Admin admin, Collection<HostResource> 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 e18677640d8..9ed3c853b19 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
@@ -638,7 +638,7 @@ public class ModelProvisioningTest {
assertEquals("Includes retired node", 1+3, model.getAdmin().getSlobroks().size());
assertEquals("default01", model.getAdmin().getSlobroks().get(0).getHostName());
assertEquals("default02", model.getAdmin().getSlobroks().get(1).getHostName());
- assertEquals("default03", model.getAdmin().getSlobroks().get(2).getHostName());
+ assertEquals("default10", model.getAdmin().getSlobroks().get(2).getHostName());
assertEquals("Included in addition because it is retired", "default09", model.getAdmin().getSlobroks().get(3).getHostName());
}
@@ -663,7 +663,7 @@ public class ModelProvisioningTest {
assertEquals("Includes retired node", 3+2, model.getAdmin().getSlobroks().size());
assertEquals("default01", model.getAdmin().getSlobroks().get(0).getHostName());
assertEquals("default02", model.getAdmin().getSlobroks().get(1).getHostName());
- assertEquals("default03", model.getAdmin().getSlobroks().get(2).getHostName());
+ assertEquals("default10", model.getAdmin().getSlobroks().get(2).getHostName());
assertEquals("Included in addition because it is retired", "default08", model.getAdmin().getSlobroks().get(3).getHostName());
assertEquals("Included in addition because it is retired", "default09", model.getAdmin().getSlobroks().get(4).getHostName());
}
@@ -692,7 +692,7 @@ public class ModelProvisioningTest {
// ... from cluster default
assertEquals("Includes retired node", 3+3, model.getAdmin().getSlobroks().size());
assertEquals("default04", model.getAdmin().getSlobroks().get(0).getHostName());
- assertEquals("default05", model.getAdmin().getSlobroks().get(1).getHostName());
+ assertEquals("default13", model.getAdmin().getSlobroks().get(1).getHostName());
assertEquals("Included in addition because it is retired", "default12", model.getAdmin().getSlobroks().get(2).getHostName());
// ... from cluster bar
assertEquals("default01", model.getAdmin().getSlobroks().get(3).getHostName());