diff options
Diffstat (limited to 'node-repository/src/main')
3 files changed, 8 insertions, 12 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndices.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndices.java index e75804fb343..a5a098dbfd6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndices.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeIndices.java @@ -17,10 +17,10 @@ class NodeIndices { private int last; private int probe; - /** Pass the list of current indices in the cluster, and whether to fill gaps or not. */ - NodeIndices(List<Integer> used, boolean compact) { + /** Pass the list of current indices in the cluster. */ + NodeIndices(List<Integer> used) { this.used = List.copyOf(used); - this.last = compact ? -1 : used.stream().max(naturalOrder()).orElse(-1); + this.last = -1; this.probe = last; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index e24d71f22f2..64a345790cc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -114,10 +114,7 @@ public class NodeRepositoryProvisioner implements Provisioner { resources = getNodeResources(cluster, requested.minResources().nodeResources(), application); nodeSpec = NodeSpec.from(requested.type()); } - var reuseIndexes = Flags.REUSE_NODE_INDEXES.bindTo(nodeRepository.flagSource()) - .with(FetchVector.Dimension.ZONE_ID, zone.systemLocalValue()) - .value(); - return asSortedHosts(preparer.prepare(application, cluster, nodeSpec, groups, reuseIndexes), resources); + return asSortedHosts(preparer.prepare(application, cluster, nodeSpec, groups), resources); } private NodeResources getNodeResources(ClusterSpec cluster, NodeResources nodeResources, ApplicationId applicationId) { 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 a6f16d3d65e..dbc92b1dbdf 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 @@ -34,10 +34,9 @@ class Preparer { } /** Prepare all required resources for the given application and cluster */ - public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, int wantedGroups, - boolean reuseIndexes) { + public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, int wantedGroups) { try { - var nodes = prepareNodes(application, cluster, requestedNodes, wantedGroups, reuseIndexes); + var nodes = prepareNodes(application, cluster, requestedNodes, wantedGroups); prepareLoadBalancer(application, cluster, requestedNodes); return nodes; } @@ -57,13 +56,13 @@ class Preparer { // but it may not change the set of active nodes, as the active nodes must stay in sync with the // active config model which is changed on activate private List<Node> prepareNodes(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, - int wantedGroups, boolean reuseIndexes) { + int wantedGroups) { NodesAndHosts<LockedNodeList> allNodesAndHosts = groupPreparer.createNodesAndHostUnlocked(); NodeList appNodes = allNodesAndHosts.nodes().owner(application); List<Node> surplusNodes = findNodesInRemovableGroups(appNodes, cluster, wantedGroups); List<Integer> usedIndices = appNodes.cluster(cluster.id()).mapToList(node -> node.allocation().get().membership().index()); - NodeIndices indices = new NodeIndices(usedIndices, reuseIndexes || ! cluster.type().isContent()); + NodeIndices indices = new NodeIndices(usedIndices); List<Node> acceptedNodes = new ArrayList<>(); for (int groupIndex = 0; groupIndex < wantedGroups; groupIndex++) { |