From 0992d1c51a38aecad0bba3452e9e5c304ff62c9f Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 13 Jul 2023 00:20:34 +0200 Subject: Simplify --- .../vespa/hosted/provision/provisioning/NodeAllocation.java | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'node-repository') diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index 1d05548e571..28caf26353b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -402,22 +402,10 @@ class NodeAllocation { } List finalNodes() { - // Set whether the node is exclusive - for (NodeCandidate candidate : nodes.values()) { - candidate = candidate.withNode(); - Allocation allocation = candidate.allocation().get(); - candidate = candidate.withNode(candidate.toNode().with(allocation.with(allocation.membership() - .with(allocation.membership().cluster().exclusive(cluster.isExclusive()))))); - nodes.put(candidate.toNode().hostname(), candidate); - } - - // Place in groups GroupAssigner groupAssigner = new GroupAssigner(requested, allNodes, nodeRepository.clock()); Collection finalNodes = groupAssigner.assignTo(nodes.values()); nodes.clear(); finalNodes.forEach(candidate -> nodes.put(candidate.toNode().hostname(), candidate)); - - // Set cluster ID and index return finalNodes.stream().map(NodeCandidate::toNode).toList(); } -- cgit v1.2.3