From 4ba118b5ada056bacd167fe4b9c684ae896202bc Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 18 Jan 2023 19:54:39 +0100 Subject: Remove temporary logging --- .../yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java | 4 ---- .../yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 6 ------ 2 files changed, 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 hosts = new ArrayList<>(); Consumer> 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 requiredHostFlavor; - private List lastOffered; - NodeAllocation(NodeList allNodes, ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, Supplier 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 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 lastOffered() { return lastOffered; } - /** Returns the cause of retirement for given candidate */ private Retirement shouldRetire(NodeCandidate candidate, List candidates) { if ( ! requestedNodes.considerRetiring()) { -- cgit v1.2.3