Merge branch 'master' into bratseth/node-metrics

3 files changed, 49 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index d5dd2138a4e..f881f888752 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -428,7 +428,11 @@ public final class Node {
 
         /** Returns whether this is a state where the node is assigned to an application */
         public boolean isAllocated() {
-            return this == reserved || this == active || this == inactive || this == failed || this == parked;
+            return allocatedStates().contains(this);
+        }
+
+        public static Set<State> allocatedStates() {
+            return Set.of(reserved, active, inactive, failed, parked);
         }
 
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
index 72be68a7ee3..91c15cdb61b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
@@ -121,8 +121,7 @@ class Preparer {
      */
     private int findHighestIndex(ApplicationId application, ClusterSpec cluster) {
         int highestIndex = -1;
-        for (Node node : nodeRepository.getNodes(application,
-                                                 Node.State.active, Node.State.inactive, Node.State.parked, Node.State.failed)) {
+        for (Node node : nodeRepository.getNodes(application, Node.State.allocatedStates().toArray(new Node.State[0]))) {
             ClusterSpec nodeCluster = node.allocation().get().membership().cluster();
             if ( ! nodeCluster.id().equals(cluster.id())) continue;
             if ( ! nodeCluster.type().equals(cluster.type())) continue;
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
index ad2e75570ea..8706661f261 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java
@@ -6,10 +6,13 @@ import com.yahoo.component.Version;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.Capacity;
 import com.yahoo.config.provision.ClusterSpec;
+import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.HostSpec;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.config.provision.NodeType;
+import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.flags.Flags;
 import com.yahoo.vespa.flags.InMemoryFlagSource;
 import com.yahoo.vespa.hosted.provision.Node;
@@ -18,11 +21,15 @@ import com.yahoo.vespa.hosted.provision.node.IP;
 import com.yahoo.vespa.hosted.provision.testutils.MockNameResolver;
 import org.junit.Test;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
@@ -103,6 +110,41 @@ public class DynamicDockerProvisionTest {
         assertEquals(4, tester.nodeRepository().getNodes(NodeType.tenant, Node.State.reserved).size());
     }
 
+    @Test
+    public void node_indices_are_unique_even_when_a_node_is_left_in_reserved_state() {
+        ProvisioningTester tester = new ProvisioningTester.Builder().zone(new Zone(Environment.prod, RegionName.from("us-east"))).build();
+        NodeResources resources = new NodeResources(10, 10, 10, 10);
+        ApplicationId app = tester.makeApplicationId();
+
+        Function<Node, Node> retireNode = node ->
+                tester.nodeRepository().write(node.withWantToRetire(true, Agent.system, Instant.now()), () -> {});
+        Function<Integer, Node> getNodeInGroup = group -> tester.nodeRepository().getNodes(app).stream()
+                .filter(node -> node.allocation().get().membership().cluster().group().get().index() == group)
+                .findAny().orElseThrow();
+
+        // Allocate 10 hosts
+        tester.makeReadyNodes(10, resources, NodeType.host, 1);
+        tester.deployZoneApp();
+
+        // Prepare & activate an application with 8 nodes and 2 groups
+        tester.activate(app, tester.prepare(app, clusterSpec("content"), 8, 2, resources));
+
+        // Retire a node in group 1 and prepare the application
+        retireNode.apply(getNodeInGroup.apply(1));
+        tester.prepare(app, clusterSpec("content"), 8, 2, resources);
+        // App is not activated, to leave node '8' in reserved state
+
+        // Retire a node in group 0 and prepare the application
+        retireNode.apply(getNodeInGroup.apply(0));
+        tester.prepare(app, clusterSpec("content"), 8, 2, resources);
+
+        // Verify that nodes have unique indices from 0..9
+        var indices = tester.nodeRepository().getNodes(app).stream()
+                .map(node -> node.allocation().get().membership().index())
+                .collect(Collectors.toSet());
+        assertTrue(indices.containsAll(IntStream.range(0, 10).boxed().collect(Collectors.toList())));
+    }
+
     private static ClusterSpec clusterSpec(String clusterId) {
         return ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from(clusterId), Version.fromString("6.42"), false);
     }
@@ -117,4 +159,5 @@ public class DynamicDockerProvisionTest {
                     .collect(Collectors.toList());
         }).when(hostProvisioner).provisionHosts(any(), any(), any());
     }
+
 }