Add test

2 files changed, 37 insertions, 0 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
index ce696903a53..6097688df72 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java
@@ -142,6 +142,11 @@ public class NodeList extends AbstractFilteringList<Node, NodeList> {
                        .collect(collectingAndThen(Collectors.toList(), NodeList::copyOf));
     }
 
+    public NodeList group(int index) {
+        return matching(n -> ( n.allocation().isPresent() &&
+                               n.allocation().get().membership().cluster().group().equals(Optional.of(ClusterSpec.Group.from(index)))));
+    }
+
     /** Returns the parent node of the given child node */
     public Optional<Node> parentOf(Node child) {
         return child.parentHostname()
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
index 03c07515cd5..060aeb80d52 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java
@@ -486,6 +486,38 @@ public class ProvisioningTest {
                            app1, cluster1);
     }
 
+    /**
+     * When increasing the number of groups without changing node count, we need to provison new nodes for
+     * the new groups since although we can remove nodes from existing groups without losing data we
+     * cannot do so without losing coverage.
+     */
+    @Test
+    public void test_change_group_layout() {
+        Flavor hostFlavor = new Flavor(new NodeResources(20, 40, 100, 4));
+        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east")))
+                                                                    .flavors(List.of(hostFlavor))
+                                                                    .build();
+        tester.makeReadyHosts(31, hostFlavor.resources()).deployZoneApp();
+
+        ApplicationId app1 = tester.makeApplicationId("app1");
+        ClusterSpec cluster1 = ClusterSpec.request(ClusterSpec.Type.content, new ClusterSpec.Id("cluster1")).vespaVersion("7").build();
+
+        // Deploy with 1 group
+        tester.activate(app1, cluster1, Capacity.from(resources(4, 1, 10, 30,  10)));
+        assertEquals(4, tester.getNodes(app1, Node.State.active).size());
+        assertEquals(4, tester.getNodes(app1, Node.State.active).group(0).size());
+        assertEquals(0, tester.getNodes(app1, Node.State.active).group(0).retired().size());
+
+        // Split into 2 groups
+        tester.activate(app1, cluster1, Capacity.from(resources(4, 2, 10, 30,  10)));
+        assertEquals(6, tester.getNodes(app1, Node.State.active).size());
+        assertEquals(4, tester.getNodes(app1, Node.State.active).group(0).size());
+        assertEquals(2, tester.getNodes(app1, Node.State.active).group(0).retired().size());
+        assertEquals(2, tester.getNodes(app1, Node.State.active).group(1).size());
+        assertEquals(0, tester.getNodes(app1, Node.State.active).group(1).retired().size());
+    }
+
+
     @Test(expected = IllegalArgumentException.class)
     public void prod_deployment_requires_redundancy() {
         ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();