aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2023-01-18 20:11:35 +0100
committerGitHub <noreply@github.com>2023-01-18 20:11:35 +0100
commitfe5cb46cc7c223e7f13929733f65107a57cd5628 (patch)
treeb49a1ee3a9de30aa01666dd1343fa767d4d4833f
parentc47ed544a31a6b56f518901247212a47d8eb9d31 (diff)
parent4ba118b5ada056bacd167fe4b9c684ae896202bc (diff)
Merge pull request #25626 from vespa-engine/bratseth/remove-temporary-loggingv8.113.20
Remove temporary logging
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java4
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java6
2 files changed, 0 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 07f9c439fe2..5c2ca58a6b7 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -99,10 +99,6 @@ public class GroupPreparer {
HostSharing sharing = hostSharing(cluster, hostType);
Version osVersion = nodeRepository.osVersions().targetFor(hostType).orElse(Version.emptyVersion);
NodeAllocation.HostDeficit deficit = allocation.hostDeficit().get();
- // TODO: Remove
- log.info("In " + application + ": " + deficit + ": " +
- allocation.lastOffered().stream().map(n -> n.toString() + "[resizable: " + n.isResizable).collect(Collectors.joining(", ")));
-
List<Node> hosts = new ArrayList<>();
Consumer<List<ProvisionedHost>> provisionedHostsConsumer = provisionedHosts -> {
hosts.addAll(provisionedHosts.stream().map(ProvisionedHost::generateHost).toList());
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 bf3ad5f15fb..a6d292b1a17 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
@@ -83,8 +83,6 @@ class NodeAllocation {
private final NodeResourceLimits nodeResourceLimits;
private final Optional<String> requiredHostFlavor;
- private List<NodeCandidate> lastOffered;
-
NodeAllocation(NodeList allNodes, ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes,
Supplier<Integer> nextIndex, NodeRepository nodeRepository) {
this.allNodes = allNodes;
@@ -99,7 +97,6 @@ class NodeAllocation {
.with(FetchVector.Dimension.CLUSTER_TYPE, cluster.type().name())
.value())
.filter(s -> !s.isBlank());
- this.lastOffered = List.of();
}
/**
@@ -112,7 +109,6 @@ class NodeAllocation {
* @param candidates the nodes which are potentially on offer. These may belong to a different application etc.
*/
void offer(List<NodeCandidate> candidates) {
- lastOffered = List.copyOf(candidates);
for (NodeCandidate candidate : candidates) {
if (candidate.allocation().isPresent()) {
Allocation allocation = candidate.allocation().get();
@@ -161,8 +157,6 @@ class NodeAllocation {
}
}
- public List<NodeCandidate> lastOffered() { return lastOffered; }
-
/** Returns the cause of retirement for given candidate */
private Retirement shouldRetire(NodeCandidate candidate, List<NodeCandidate> candidates) {
if ( ! requestedNodes.considerRetiring()) {