From 49ad958565e4db19872bfb1a069a0209a652c011 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 10 Jun 2020 12:42:51 +0200 Subject: Nonfunctional changes only --- .../java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java | 1 + 1 file changed, 1 insertion(+) (limited to 'documentapi/src') diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java index 0db239b33bf..dbe6bb2ff45 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java @@ -82,4 +82,5 @@ public abstract class DocumentMessage extends Message { public Utf8String getProtocol() { return DocumentProtocol.NAME; } + } -- cgit v1.2.3 From 7f7b6777514bf05916e2edcbc3e27b1bfd28906c Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 12 Jun 2020 12:51:22 +0200 Subject: SpareCapacityMaintainer sketch --- .../com/yahoo/config/provision/package-info.java | 1 - .../document/select/DocumentSelectorTestCase.java | 2 + .../messagebus/MessageBusVisitorSession.java | 1 - .../yahoo/language/opennlp/OpenNlpTokenizer.java | 1 + .../yahoo/language/process/CharacterClasses.java | 3 +- .../com/yahoo/language/process/GramSplitter.java | 83 +++------ .../com/yahoo/language/process/Normalizer.java | 8 +- .../language/process/ProcessingException.java | 2 +- .../com/yahoo/language/process/Transformer.java | 4 +- .../com/yahoo/vespa/hosted/provision/Node.java | 2 + .../com/yahoo/vespa/hosted/provision/NodeList.java | 15 +- .../autoscale/AllocatableClusterResources.java | 12 +- .../maintenance/AutoscalingMaintainer.java | 2 +- .../provision/maintenance/CapacityChecker.java | 10 +- .../maintenance/MaintenanceDeployment.java | 15 +- .../maintenance/NodeRepositoryMaintenance.java | 2 +- .../hosted/provision/maintenance/Rebalancer.java | 29 ++- .../maintenance/SpareCapacityMaintainer.java | 205 ++++++++++++++++++--- .../yahoo/vespa/hosted/provision/node/Agent.java | 3 +- .../hosted/provision/provisioning/Activator.java | 4 +- .../provision/provisioning/DockerHostCapacity.java | 84 --------- .../EmptyProvisionServiceProvider.java | 2 +- .../provision/provisioning/HostCapacity.java | 109 +++++++++++ .../provision/provisioning/NodeAllocation.java | 4 +- .../provision/provisioning/NodePrioritizer.java | 26 +-- .../hosted/provision/provisioning/NodeSpec.java | 2 +- .../provision/provisioning/PrioritizableNode.java | 2 +- .../provision/restapi/ApplicationSerializer.java | 2 +- .../provision/restapi/HostCapacityResponse.java | 2 +- .../provision/autoscale/AutoscalingTest.java | 2 +- .../provision/autoscale/AutoscalingTester.java | 4 +- .../maintenance/CapacityCheckerTester.java | 4 +- .../provision/maintenance/MetricsReporterTest.java | 2 +- .../provision/maintenance/NodeFailerTest.java | 4 +- .../provisioning/AllocationVisualizer.java | 4 +- .../provisioning/DockerHostCapacityTest.java | 138 -------------- .../provisioning/DockerProvisioningTest.java | 4 +- .../provisioning/DynamicDockerAllocationTest.java | 2 +- .../provision/provisioning/HostCapacityTest.java | 138 ++++++++++++++ .../provisioning/InPlaceResizeProvisionTest.java | 6 +- .../provisioning/InfraDeployerImplTest.java | 2 +- .../provision/provisioning/ProvisioningTester.java | 6 +- .../java/com/yahoo/vespavisit/VdsVisitHandler.java | 33 ++-- 43 files changed, 564 insertions(+), 422 deletions(-) delete mode 100644 node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java create mode 100644 node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java delete mode 100644 node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java create mode 100644 node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java (limited to 'documentapi/src') diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/package-info.java b/config-provisioning/src/main/java/com/yahoo/config/provision/package-info.java index c85c00d8ebe..1eebf6388c7 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/package-info.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/package-info.java @@ -2,5 +2,4 @@ @ExportPackage package com.yahoo.config.provision; -import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java index 2e08814bf43..5e61f8c7ba0 100644 --- a/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java +++ b/document/src/test/java/com/yahoo/document/select/DocumentSelectorTestCase.java @@ -42,6 +42,7 @@ public class DocumentSelectorTestCase { type.addField("hfloat", DataType.FLOAT); type.addField("hstring", DataType.STRING); type.addField("content", DataType.STRING); + type.addField("truth", DataType.BOOL); StructDataType mystruct = new StructDataType("mystruct"); mystruct.addField(new Field("key", DataType.INT)); @@ -87,6 +88,7 @@ public class DocumentSelectorTestCase { assertParse("music_.artist = \"*\""); assertParse("music_foo.artist = \"*\""); assertParse("music_foo_.artist = \"*\""); + assertParse("truth"); assertParse("(4 + 3) > 0", "(4+3) > 0"); assertParse("1 + 1 > 0", "1 +1 > 0"); assertParse("1 + -1 > 0", "1 + -1 > 0"); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java index 00a68c99500..69db27686f0 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java @@ -690,7 +690,6 @@ public class MessageBusVisitorSession implements VisitorSession { private void markSessionCompleted() { // 'done' is only ever written when token mutex is held, so safe to check // outside of completionMonitor lock. - assert(!done) : "Session was marked as completed more than once"; log.log(Level.FINE, "Visitor session '" + sessionName + "' has completed"); if (params.getLocalDataHandler() != null) { params.getLocalDataHandler().onDone(); diff --git a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java b/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java index d3f6fcf2ee3..93599fa7dbe 100644 --- a/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java +++ b/linguistics/src/main/java/com/yahoo/language/opennlp/OpenNlpTokenizer.java @@ -15,6 +15,7 @@ import java.util.logging.Logger; import java.util.logging.Level; public class OpenNlpTokenizer implements Tokenizer { + private final static int SPACE_CODE = 32; private static final Logger log = Logger.getLogger(OpenNlpTokenizer.class.getName()); private final Normalizer normalizer; diff --git a/linguistics/src/main/java/com/yahoo/language/process/CharacterClasses.java b/linguistics/src/main/java/com/yahoo/language/process/CharacterClasses.java index ce0291c85e5..59ae664e79e 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/CharacterClasses.java +++ b/linguistics/src/main/java/com/yahoo/language/process/CharacterClasses.java @@ -17,7 +17,7 @@ public class CharacterClasses { if (Character.isDigit(c) && ! isLatin(c)) return true; // Not considering these digits, so treat them as letters // if (c == '_') return true; - // Ticket 3864695, some CJK punctuation YST defined as word characters + // Some CJK punctuation defined as word characters if (c == '\u3008' || c == '\u3009' || c == '\u300a' || c == '\u300b' || c == '\u300c' || c == '\u300d' || c == '\u300e' || c == '\u300f' || c == '\u3010' || c == '\u3011') { @@ -52,4 +52,5 @@ public class CharacterClasses { public boolean isLetterOrDigit(int c) { return isLetter(c) || isDigit(c); } + } diff --git a/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java b/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java index 94fd0e08493..aa7ae59edf9 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java +++ b/linguistics/src/main/java/com/yahoo/language/process/GramSplitter.java @@ -39,12 +39,8 @@ public class GramSplitter { * @throws IllegalArgumentException if n is less than 1 */ public GramSplitterIterator split(String input, int n) { - if (input == null) { - throw new NullPointerException("input cannot be null"); - } - if (n < 1) { - throw new IllegalArgumentException("n (gram size) cannot be smaller than 1, was " + n); - } + if (input == null) throw new NullPointerException("input cannot be null"); + if (n < 1) throw new IllegalArgumentException("n (gram size) cannot be smaller than 1, was " + n); return new GramSplitterIterator(input, n, characterClasses); } @@ -52,29 +48,19 @@ public class GramSplitter { private final CharacterClasses characterClasses; - /** - * Text to split - */ + /** Text to split */ private final String input; - /** - * Gram size - */ + /** Gram size */ private final int n; - /** - * Current index - */ + /** Current index */ private int i = 0; - /** - * Whether the last thing that happened was being on a separator (including the start of the string) - */ + /** Whether the last thing that happened was being on a separator (including the start of the string) */ private boolean isFirstAfterSeparator = true; - /** - * The next gram or null if not determined yet - */ + /** The next gram or null if not determined yet */ private Gram nextGram = null; public GramSplitterIterator(String input, int n, CharacterClasses characterClasses) { @@ -85,9 +71,7 @@ public class GramSplitter { @Override public boolean hasNext() { - if (nextGram != null) { - return true; - } + if (nextGram != null) return true; nextGram = findNext(); return nextGram != null; } @@ -95,12 +79,10 @@ public class GramSplitter { @Override public Gram next() { Gram currentGram = nextGram; - if (currentGram == null) { + if (currentGram == null) currentGram = findNext(); - } - if (currentGram == null) { + if (currentGram == null) throw new NoSuchElementException("No next gram at position " + i); - } nextGram = null; return currentGram; } @@ -111,24 +93,21 @@ public class GramSplitter { i++; isFirstAfterSeparator = true; } - if (i >= input.length()) { - return null; - } + if (i >= input.length()) return null; String gram = input.substring(i, Math.min(i + n, input.length())); int nonWordChar = indexOfNonWordChar(gram); - if (nonWordChar == 0) { - throw new RuntimeException("Programming error"); - } - if (nonWordChar > 0) { + if (nonWordChar == 0) throw new RuntimeException("Programming error"); + + if (nonWordChar > 0) gram = gram.substring(0, nonWordChar); - } if (gram.length() == n) { // normal case: got a full length gram i++; isFirstAfterSeparator = false; return new Gram(i - 1, gram.length()); - } else { // gram is too short due either to a non-word separator or end of string + } + else { // gram is too short due either to a non-word separator or end of string if (isFirstAfterSeparator) { // make a gram anyway i++; isFirstAfterSeparator = false; @@ -143,9 +122,8 @@ public class GramSplitter { private int indexOfNonWordChar(String s) { for (int i = 0; i < s.length(); i++) { - if (!characterClasses.isLetterOrDigit(s.codePointAt(i))) { + if ( ! characterClasses.isLetterOrDigit(s.codePointAt(i))) return i; - } } return -1; } @@ -162,9 +140,8 @@ public class GramSplitter { */ public List toExtractedList() { List gramList = new ArrayList<>(); - while (hasNext()) { + while (hasNext()) gramList.add(next().extractFrom(input)); - } return Collections.unmodifiableList(gramList); } } @@ -189,31 +166,19 @@ public class GramSplitter { return length; } - /** - * Returns this gram as a string from the input string - */ + /** Returns this gram as a string from the input string */ public String extractFrom(String input) { return input.substring(start, start + length); } @Override public boolean equals(Object o) { - if (this == o) { - return true; - } - if (!(o instanceof Gram)) { - return false; - } + if (this == o) return true; + if ( ! (o instanceof Gram)) return false; Gram gram = (Gram)o; - - if (length != gram.length) { - return false; - } - if (start != gram.start) { - return false; - } - + if (length != gram.length) return false; + if (start != gram.start) return false; return true; } @@ -223,5 +188,7 @@ public class GramSplitter { result = 31 * result + length; return result; } + } + } diff --git a/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java b/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java index 0e34f88f4ca..044d249f077 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java +++ b/linguistics/src/main/java/com/yahoo/language/process/Normalizer.java @@ -9,11 +9,11 @@ package com.yahoo.language.process; public interface Normalizer { /** - *

NFKC normalizes a String.

+ * NFKC normalizes a String. * - * @param input String to normalize. - * @return The normalized String. - * @throws ProcessingException If underlying library throws an Exception. + * @param input the string to normalize + * @return the normalized string + * @throws ProcessingException if underlying library throws an Exception */ String normalize(String input); diff --git a/linguistics/src/main/java/com/yahoo/language/process/ProcessingException.java b/linguistics/src/main/java/com/yahoo/language/process/ProcessingException.java index 941afa07347..752992f5a26 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/ProcessingException.java +++ b/linguistics/src/main/java/com/yahoo/language/process/ProcessingException.java @@ -2,7 +2,7 @@ package com.yahoo.language.process; /** - *

Exception class indicating that a fatal error occured during linguistic processing.

+ * Exception class indicating that a fatal error occured during linguistic processing. * * @author Simon Thoresen Hult */ diff --git a/linguistics/src/main/java/com/yahoo/language/process/Transformer.java b/linguistics/src/main/java/com/yahoo/language/process/Transformer.java index 46f3c060d4e..4927edc98c9 100644 --- a/linguistics/src/main/java/com/yahoo/language/process/Transformer.java +++ b/linguistics/src/main/java/com/yahoo/language/process/Transformer.java @@ -13,8 +13,8 @@ public interface Transformer { /** * Remove accents from input text. * - * @param input text to transform. - * @param language language of input text. + * @param input text to transform + * @param language language of input text * @return text with accents removed, or input-text if the feature is unavailable * @throws ProcessingException thrown if there is an exception stemming this input */ 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 a9861497ca3..b6237886dc7 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 @@ -128,6 +128,8 @@ public final class Node { return parentHostname.isPresent() && parentHostname.get().equals(hostname); } + public NodeResources resources() { return flavor.resources(); } + /** Returns the flavor of this node */ public Flavor flavor() { return flavor; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java index 1b2f73a2f5f..1cc2abef734 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeList.java @@ -46,13 +46,21 @@ public class NodeList extends AbstractFilteringList { } /** Returns the subset of nodes having exactly the given resources */ - public NodeList resources(NodeResources resources) { return matching(node -> node.flavor().resources().equals(resources)); } + public NodeList resources(NodeResources resources) { return matching(node -> node.resources().equals(resources)); } + + /** Returns the subset of nodes which satisfy the given resources */ + public NodeList satisfies(NodeResources resources) { return matching(node -> node.resources().satisfies(resources)); } /** Returns the subset of nodes of the given flavor */ public NodeList flavor(String flavor) { return matching(node -> node.flavor().name().equals(flavor)); } + /** Returns the subset of nodes not in the given collection */ + public NodeList except(Collection nodes) { + return matching(node -> ! nodes.contains(node)); + } + /** Returns the subset of nodes assigned to the given cluster type */ public NodeList type(ClusterSpec.Type type) { return matching(node -> node.allocation().isPresent() && node.allocation().get().membership().cluster().type().equals(type)); @@ -109,6 +117,11 @@ public class NodeList extends AbstractFilteringList { return matching(node -> nodeTypes.contains(node.type())); } + /** Returns the subset of nodes of the host type */ + public NodeList hosts() { + return matching(node -> node.type() == NodeType.host); + } + /** Returns the subset of nodes that are parents */ public NodeList parents() { return matching(n -> n.parentHostname().isEmpty()); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java index e6cbddf96f2..267bfefa332 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java @@ -47,7 +47,7 @@ public class AllocatableClusterResources { this.nodes = nodes.size(); this.groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count(); this.realResources = averageRealResourcesOf(nodes, nodeRepository); // Average since we average metrics over nodes - this.advertisedResources = nodes.get(0).flavor().resources(); + this.advertisedResources = nodes.get(0).resources(); this.clusterType = nodes.get(0).allocation().get().membership().cluster().type(); this.fulfilment = 1; } @@ -125,11 +125,11 @@ public class AllocatableClusterResources { NodeResources sum = new NodeResources(0, 0, 0, 0); for (Node node : nodes) sum = sum.add(nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository).justNumbers()); - return nodes.get(0).flavor().resources().justNonNumbers() - .withVcpu(sum.vcpu() / nodes.size()) - .withMemoryGb(sum.memoryGb() / nodes.size()) - .withDiskGb(sum.diskGb() / nodes.size()) - .withBandwidthGbps(sum.bandwidthGbps() / nodes.size()); + return nodes.get(0).resources().justNonNumbers() + .withVcpu(sum.vcpu() / nodes.size()) + .withMemoryGb(sum.memoryGb() / nodes.size()) + .withDiskGb(sum.diskGb() / nodes.size()) + .withBandwidthGbps(sum.bandwidthGbps() / nodes.size()); } public static Optional from(ClusterResources wantedResources, diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java index fa8e8375e23..c32b7854d4e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java @@ -85,7 +85,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer { int currentGroups = (int)clusterNodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count(); ClusterSpec.Type clusterType = clusterNodes.get(0).allocation().get().membership().cluster().type(); log.info("Autoscaling " + application + " " + clusterType + " " + clusterId + ":" + - "\nfrom " + toString(clusterNodes.size(), currentGroups, clusterNodes.get(0).flavor().resources()) + + "\nfrom " + toString(clusterNodes.size(), currentGroups, clusterNodes.get(0).resources()) + "\nto " + toString(target.nodes(), target.groups(), target.nodeResources())); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java index 97253df900b..97810c0b329 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java @@ -136,7 +136,7 @@ public class CapacityChecker { int occupiedIps = 0; Set ipPool = host.ipAddressPool().asSet(); for (var child : nodeChildren.get(host)) { - hostResources = hostResources.subtract(child.flavor().resources().justNumbers()); + hostResources = hostResources.subtract(child.resources().justNumbers()); occupiedIps += child.ipAddresses().stream().filter(ipPool::contains).count(); } availableResources.put(host, new AllocationResources(hostResources, host.ipAddressPool().asSet().size() - occupiedIps)); @@ -250,7 +250,7 @@ public class CapacityChecker { long eligibleParents = hosts.stream().filter(h -> !violatesParentHostPolicy(node, h, containedAllocations) - && availableResources.get(h).satisfies(AllocationResources.from(node.flavor().resources()))).count(); + && availableResources.get(h).satisfies(AllocationResources.from(node.resources()))).count(); allocationHistory.addEntry(node, newParent.get(), eligibleParents + 1); } } @@ -302,7 +302,7 @@ public class CapacityChecker { reason.violatesParentHostPolicy = violatesParentHostPolicy(node, host, containedAllocations); NodeResources l = availableHostResources.nodeResources; - NodeResources r = node.allocation().map(Allocation::requestedResources).orElse(node.flavor().resources()); + NodeResources r = node.allocation().map(Allocation::requestedResources).orElse(node.resources()); if (l.vcpu() < r.vcpu()) reason.insufficientVcpu = true; @@ -391,7 +391,7 @@ public class CapacityChecker { if (node.allocation().isPresent()) return from(node.allocation().get().requestedResources()); else - return from(node.flavor().resources()); + return from(node.resources()); } public static AllocationResources from(NodeResources nodeResources) { @@ -514,7 +514,7 @@ public class CapacityChecker { public String toString() { return String.format("%-20s %-65s -> %15s [%3d valid]", tenant.hostname().replaceFirst("\\..+", ""), - tenant.flavor().resources(), + tenant.resources(), newParent == null ? "x" : newParent.hostname().replaceFirst("\\..+", ""), this.eligibleParents ); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java index b006b2f964b..db331e88d64 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java @@ -131,14 +131,19 @@ class MaintenanceDeployment implements Closeable { public static class Move { - final Node node; - final Node toHost; + private final Node node; + private final Node fromHost, toHost; - Move(Node node, Node toHost) { + Move(Node node, Node fromHost, Node toHost) { this.node = node; + this.fromHost = fromHost; this.toHost = toHost; } + public Node node() { return node; } + public Node fromHost() { return fromHost; } + public Node toHost() { return toHost; } + /** * Try to deploy to make this move. * @@ -197,10 +202,10 @@ class MaintenanceDeployment implements Closeable { @Override public String toString() { return "move " + - ( isEmpty() ? "none" : (node.hostname() + " to " + toHost)); + ( isEmpty() ? "none" : (node.hostname() + " from " + fromHost + " to " + toHost)); } - public static Move empty() { return new Move(null, null); } + public static Move empty() { return new Move(null, null, null); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java index caf845d36cb..c3f8afae4a4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRepositoryMaintenance.java @@ -88,7 +88,7 @@ public class NodeRepositoryMaintenance extends AbstractComponent { new LoadBalancerExpirer(nodeRepository, defaults.loadBalancerExpirerInterval, lbService)); dynamicProvisioningMaintainer = provisionServiceProvider.getHostProvisioner().map(hostProvisioner -> new DynamicProvisioningMaintainer(nodeRepository, defaults.dynamicProvisionerInterval, hostProvisioner, flagSource)); - spareCapacityMaintainer = new SpareCapacityMaintainer(deployer, nodeRepository, metric, clock, defaults.spareCapacityMaintenanceInterval); + spareCapacityMaintainer = new SpareCapacityMaintainer(deployer, nodeRepository, metric, defaults.spareCapacityMaintenanceInterval); osUpgradeActivator = new OsUpgradeActivator(nodeRepository, defaults.osUpgradeActivatorInterval); rebalancer = new Rebalancer(deployer, nodeRepository, metric, clock, defaults.rebalancerInterval); nodeMetricsDbMaintainer = new NodeMetricsDbMaintainer(nodeRepository, nodeMetrics, nodeMetricsDb, defaults.nodeMetricsCollectionInterval); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java index da3b9bd0e65..e10ac68fde0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/Rebalancer.java @@ -6,16 +6,14 @@ import com.yahoo.config.provision.Deployer; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.jdisc.Metric; -import com.yahoo.transaction.Mutex; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Agent; -import com.yahoo.vespa.hosted.provision.provisioning.DockerHostCapacity; +import com.yahoo.vespa.hosted.provision.provisioning.HostCapacity; import java.time.Clock; import java.time.Duration; -import java.util.Optional; /** * @author bratseth @@ -53,7 +51,7 @@ public class Rebalancer extends NodeRepositoryMaintainer { /** We do this here rather than in MetricsReporter because it is expensive and frequent updates are unnecessary */ private void updateSkewMetric(NodeList allNodes) { - DockerHostCapacity capacity = new DockerHostCapacity(allNodes, nodeRepository().resourcesCalculator()); + HostCapacity capacity = new HostCapacity(allNodes, nodeRepository().resourcesCalculator()); double totalSkew = 0; int hostCount = 0; for (Node host : allNodes.nodeType((NodeType.host)).state(Node.State.active)) { @@ -75,7 +73,7 @@ public class Rebalancer extends NodeRepositoryMaintainer { * Returns Move.none if no moves can be made to reduce skew. */ private Move findBestMove(NodeList allNodes) { - DockerHostCapacity capacity = new DockerHostCapacity(allNodes, nodeRepository().resourcesCalculator()); + HostCapacity capacity = new HostCapacity(allNodes, nodeRepository().resourcesCalculator()); Move bestMove = Move.empty(); for (Node node : allNodes.nodeType(NodeType.tenant).state(Node.State.active)) { if (node.parentHostname().isEmpty()) continue; @@ -84,29 +82,29 @@ public class Rebalancer extends NodeRepositoryMaintainer { if (deployedRecently(applicationId)) continue; for (Node toHost : allNodes.matching(nodeRepository()::canAllocateTenantNodeTo)) { if (toHost.hostname().equals(node.parentHostname().get())) continue; - if ( ! capacity.freeCapacityOf(toHost).satisfies(node.flavor().resources())) continue; + if ( ! capacity.freeCapacityOf(toHost).satisfies(node.resources())) continue; double skewReductionAtFromHost = skewReductionByRemoving(node, allNodes.parentOf(node).get(), capacity); double skewReductionAtToHost = skewReductionByAdding(node, toHost, capacity); double netSkewReduction = skewReductionAtFromHost + skewReductionAtToHost; if (netSkewReduction > bestMove.netSkewReduction) - bestMove = new Move(node, toHost, netSkewReduction); + bestMove = new Move(node, nodeRepository().getNode(node.parentHostname().get()).get(), toHost, netSkewReduction); } } return bestMove; } - private double skewReductionByRemoving(Node node, Node fromHost, DockerHostCapacity capacity) { + private double skewReductionByRemoving(Node node, Node fromHost, HostCapacity capacity) { NodeResources freeHostCapacity = capacity.freeCapacityOf(fromHost); double skewBefore = Node.skew(fromHost.flavor().resources(), freeHostCapacity); double skewAfter = Node.skew(fromHost.flavor().resources(), freeHostCapacity.add(node.flavor().resources().justNumbers())); return skewBefore - skewAfter; } - private double skewReductionByAdding(Node node, Node toHost, DockerHostCapacity capacity) { + private double skewReductionByAdding(Node node, Node toHost, HostCapacity capacity) { NodeResources freeHostCapacity = capacity.freeCapacityOf(toHost); double skewBefore = Node.skew(toHost.flavor().resources(), freeHostCapacity); - double skewAfter = Node.skew(toHost.flavor().resources(), freeHostCapacity.subtract(node.flavor().resources().justNumbers())); + double skewAfter = Node.skew(toHost.flavor().resources(), freeHostCapacity.subtract(node.resources().justNumbers())); return skewBefore - skewAfter; } @@ -122,20 +120,19 @@ public class Rebalancer extends NodeRepositoryMaintainer { final double netSkewReduction; - Move(Node node, Node toHost, double netSkewReduction) { - super(node, toHost); + Move(Node node, Node fromHost, Node toHost, double netSkewReduction) { + super(node, fromHost, toHost); this.netSkewReduction = netSkewReduction; } @Override public String toString() { - return "move " + - ( node == null ? "none" : - (node.hostname() + " to " + toHost + " [skew reduction " + netSkewReduction + "]")); + if (isEmpty()) return "move none"; + return super.toString() + " [skew reduction " + netSkewReduction + "]"; } public static Move empty() { - return new Move(null, null, 0); + return new Move(null, null, null, 0); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java index c0e39b39e94..4179d6d3f83 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java @@ -2,15 +2,21 @@ package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.config.provision.Deployer; +import com.yahoo.config.provision.NodeResources; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; +import com.yahoo.vespa.hosted.provision.maintenance.MaintenanceDeployment.Move; +import com.yahoo.vespa.hosted.provision.node.Agent; +import com.yahoo.vespa.hosted.provision.provisioning.HostCapacity; -import java.time.Clock; import java.time.Duration; +import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.logging.Level; import java.util.stream.Collectors; @@ -29,19 +35,18 @@ import java.util.stream.Collectors; */ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { + private static final int maxMoves = 5; + private final Deployer deployer; private final Metric metric; - private final Clock clock; public SpareCapacityMaintainer(Deployer deployer, NodeRepository nodeRepository, Metric metric, - Clock clock, Duration interval) { super(nodeRepository, interval); this.deployer = deployer; this.metric = metric; - this.clock = clock; } @Override @@ -60,46 +65,194 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer { Optional failurePath = capacityChecker.worstCaseHostLossLeadingToFailure(); if (failurePath.isPresent()) { - int worstCaseHostLoss = failurePath.get().hostsCausingFailure.size(); - metric.set("spareHostCapacity", worstCaseHostLoss - 1, null); - if (worstCaseHostLoss == 1) { // Try to get back to needing 2 hosts to fail in the worst case - Optional moveCandidate = identifyMoveCandidate(failurePath.get()); - if (moveCandidate.isPresent()) - move(moveCandidate.get()); + int spareHostCapacity = failurePath.get().hostsCausingFailure.size() - 1; + if (spareHostCapacity == 0) { + Move move = findMitigatingMove(failurePath.get()); + boolean success = move.execute(Agent.SpareCapacityMaintainer, deployer, metric, nodeRepository()); + if (success) { + // This may strictly be a (noble) lie: We succeeded in taking one step to mitigate, + // but not necessarily *all* steps needed to justify adding 1 to spare capacity. + // However, we alert on this being 0 and we don't want to do that as long as we're not stuck. + spareHostCapacity++; + } } + metric.set("spareHostCapacity", spareHostCapacity, null); } } - private Optional identifyMoveCandidate(CapacityChecker.HostFailurePath failurePath) { + private Move findMitigatingMove(CapacityChecker.HostFailurePath failurePath) { Optional nodeWhichCantMove = failurePath.failureReason.tenant; - if (nodeWhichCantMove.isEmpty()) return Optional.empty(); - return findMoveWhichMakesRoomFor(nodeWhichCantMove.get()); + if (nodeWhichCantMove.isEmpty()) return Move.empty(); + return moveTowardsSpareFor(nodeWhichCantMove.get()); } - private Optional findMoveWhichMakesRoomFor(Node node) { - return Optional.empty(); + private Move moveTowardsSpareFor(Node node) { + NodeList allNodes = nodeRepository().list(); + // Allocation will assign the two most empty nodes as "spares", which will not be allocated on + // unless needed for node failing. Our goal here is to make room on these spares for the given node + HostCapacity hostCapacity = new HostCapacity(allNodes, nodeRepository().resourcesCalculator()); + Set spareHosts = hostCapacity.findSpareHosts(allNodes.hosts().satisfies(node.resources()).asList(), 2); + List hosts = allNodes.hosts().except(spareHosts).asList(); + + CapacitySolver capacitySolver = new CapacitySolver(hostCapacity); + List shortestMitigation = null; + for (Node spareHost : spareHosts) { + List mitigation = capacitySolver.makeRoomFor(node, spareHost, hosts, List.of(), maxMoves); + if (mitigation == null) continue; + if (shortestMitigation == null || shortestMitigation.size() > mitigation.size()) + shortestMitigation = mitigation; + } + if (shortestMitigation == null || shortestMitigation.isEmpty()) return Move.empty(); + return shortestMitigation.get(0); } - private void move(Move move) { + private static class CapacitySolver { + + private final HostCapacity hostCapacity; + + CapacitySolver(HostCapacity hostCapacity) { + this.hostCapacity = hostCapacity; + } + + /** + * Finds the shortest sequence of moves which makes room for the given node on the given host, + * assuming the given moves already made over the given hosts' current allocation. + * + * @param node the node to make room for + * @param host the target host to make room on + * @param hosts the hosts onto which we can move nodes + * @param movesMade the moves already made in this scenario + * @return the list of movesMade with the moves needed for this appended, in the order they should be performed, + * or null if no sequence could be found + */ + List makeRoomFor(Node node, Node host, List hosts, List movesMade, int movesLeft) { + if ( ! host.resources().satisfies(node.resources())) return null; + NodeResources freeCapacity = freeCapacityWith(movesMade, host); + if (freeCapacity.satisfies(node.resources())) return List.of(); + if (movesLeft == 0) return null; + + List shortest = null; + for (var i = Subsets(hostCapacity.allNodes().childrenOf(host), movesLeft); i.hasNext(); ) { + List childrenToMove = i.next(); + if ( ! addResourcesOf(childrenToMove, freeCapacity).satisfies(node.resources())) continue; + List moves = move(childrenToMove, host, hosts, movesMade, movesLeft); + if (moves == null) continue; + if (shortest == null || moves.size() < shortest.size()) + shortest = moves; + } + if (shortest == null) return null; + List total = append(movesMade, shortest); + if (total.size() > movesLeft) return null; + return total; + } + + private List move(List nodes, Node host, List hosts, List movesMade, int movesLeft) { + List moves = new ArrayList<>(); + for (Node childToMove : nodes) { + List childMoves = move(childToMove, host, hosts, append(movesMade, moves), movesLeft - moves.size()); + if (childMoves == null) return null; + moves.addAll(childMoves); + if (moves.size() > movesLeft) return null; + } + return moves; + } + + private List move(Node node, Node host, List hosts, List movesMade, int movesLeft) { + List shortest = null; + for (Node target : hosts) { + List childMoves = makeRoomFor(node, target, hosts, movesMade, movesLeft - 1); + if (childMoves == null) continue; + if (shortest == null || shortest.size() > childMoves.size() + 1) { + shortest = new ArrayList<>(childMoves); + shortest.add(new Move(node, host, target)); + } + } + return shortest; + } + + private NodeResources addResourcesOf(List nodes, NodeResources resources) { + for (Node node : nodes) + resources = resources.add(node.resources()); + return resources; + } + + private Iterator> Subsets(NodeList nodes, int maxLength) { + return new SubsetIterator(nodes.asList(), maxLength); + } + + private List append(List a, List b) { + List list = new ArrayList<>(); + list.addAll(a); + list.addAll(b); + return list; + } + + private NodeResources freeCapacityWith(List moves, Node host) { + NodeResources resources = hostCapacity.freeCapacityOf(host); + for (Move move : moves) { + if ( ! move.toHost().equals(host)) continue; + resources = resources.subtract(move.node().resources()); + } + for (Move move : moves) { + if ( ! move.fromHost().equals(host)) continue; + resources = resources.add(move.fromHost().resources()); + } + return resources; + } } - private static class Move { + private static class SubsetIterator implements Iterator> { + + private final List nodes; + private final int maxLength; + + // A number whose binary representation determines which items of list we'll include + private int i = 0; // first "previous" = 0 -> skip the empty set + private List next = null; - static final Move none = new Move(null, null); + public SubsetIterator(List nodes, int maxLength) { + this.nodes = new ArrayList<>(nodes.subList(0, Math.min(nodes.size(), 31))); + this.maxLength = maxLength; + } + + @Override + public boolean hasNext() { + if (next != null) return true; - final Node node; - final Node toHost; + // find next + while (++i < 1< maxLength) continue; - Move(Node node, Node toHost) { - this.node = node; - this.toHost = toHost; + next = new ArrayList<>(ones); + for (int position = 0; position < nodes.size(); position++) { + if (hasOneAtPosition(position, i)) + next.add(nodes.get(position)); + } + return true; + } + return false; } @Override - public String toString() { - return "move " + - ( node == null ? "none" : (node.hostname() + " to " + toHost)); + public List next() { + next = null; + if ( ! hasNext()) throw new IllegalStateException("No more elements"); + return next; + } + + private boolean hasOneAtPosition(int position, int number) { + return (number & (1 << position)) > 0; + } + + private int onesIn(int number) { + int ones = 0; + for (int position = 0; Math.pow(2, position) <= number; position++) { + if (hasOneAtPosition(position, number)) + ones++; + } + return ones; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java index 31b7181a58a..eba9e4a1ac9 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Agent.java @@ -21,6 +21,7 @@ public enum Agent { ProvisionedExpirer, ReservationExpirer, DynamicProvisioningMaintainer, - RetiringUpgrader; + RetiringUpgrader, + SpareCapacityMaintainer } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java index ebe9327967e..7ad69d673e7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java @@ -184,12 +184,12 @@ class Activator { for (Node node : nodes) { HostSpec hostSpec = getHost(node.hostname(), hosts); node = hostSpec.membership().get().retired() ? node.retire(nodeRepository.clock().instant()) : node.unretire(); - if (! hostSpec.advertisedResources().equals(node.flavor().resources())) // A resized node + if (! hostSpec.advertisedResources().equals(node.resources())) // A resized node node = node.with(new Flavor(hostSpec.advertisedResources())); Allocation allocation = node.allocation().get() .with(hostSpec.membership().get()) .withRequestedResources(hostSpec.requestedResources() - .orElse(node.flavor().resources())); + .orElse(node.resources())); if (hostSpec.networkPorts().isPresent()) allocation = allocation.withNetworkPorts(hostSpec.networkPorts().get()); node = node.with(allocation); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java deleted file mode 100644 index b508198db3a..00000000000 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java +++ /dev/null @@ -1,84 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.provisioning; - -import com.yahoo.config.provision.NodeResources; -import com.yahoo.config.provision.NodeType; -import com.yahoo.vespa.hosted.provision.Node; -import com.yahoo.vespa.hosted.provision.NodeList; - -import java.util.Objects; - -/** - * Capacity calculation for docker hosts. - *

- * The calculations are based on an immutable copy of nodes that represents - * all capacities in the system - i.e. all nodes in the node repo. - * - * @author smorgrav - */ -public class DockerHostCapacity { - - private final NodeList allNodes; - private final HostResourcesCalculator hostResourcesCalculator; - - public DockerHostCapacity(NodeList allNodes, HostResourcesCalculator hostResourcesCalculator) { - this.allNodes = Objects.requireNonNull(allNodes, "allNodes must be non-null"); - this.hostResourcesCalculator = Objects.requireNonNull(hostResourcesCalculator, "hostResourcesCalculator must be non-null"); - } - - int compareWithoutInactive(Node hostA, Node hostB) { - int result = compare(freeCapacityOf(hostB, true), freeCapacityOf(hostA, true)); - if (result != 0) return result; - - // If resources are equal we want to assign to the one with the most IP addresses free - return freeIPs(hostB) - freeIPs(hostA); - } - - private int compare(NodeResources a, NodeResources b) { - return NodeResourceComparator.defaultOrder().compare(a, b); - } - - /** - * Checks the node capacity and free ip addresses to see - * if we could allocate a flavor on the docker host. - */ - boolean hasCapacity(Node dockerHost, NodeResources requestedCapacity) { - return freeCapacityOf(dockerHost, false).satisfies(requestedCapacity) && freeIPs(dockerHost) > 0; - } - - /** - * Number of free (not allocated) IP addresses assigned to the dockerhost. - */ - int freeIPs(Node dockerHost) { - return dockerHost.ipAddressPool().findUnused(allNodes).size(); - } - - /** - * Calculate the remaining capacity of a host. - * - * @param host the host to find free capacity of. - * @return a default (empty) capacity if not a docker host, otherwise the free/unallocated/rest capacity - */ - public NodeResources freeCapacityOf(Node host) { - return freeCapacityOf(host, false); - } - - NodeResources freeCapacityOf(Node host, boolean excludeInactive) { - // Only hosts have free capacity - if ( ! host.type().canRun(NodeType.tenant)) return new NodeResources(0, 0, 0, 0); - - NodeResources hostResources = hostResourcesCalculator.advertisedResourcesOf(host.flavor()); - return allNodes.childrenOf(host).asList().stream() - .filter(node -> !(excludeInactive && isInactiveOrRetired(node))) - .map(node -> node.flavor().resources().justNumbers()) - .reduce(hostResources.justNumbers(), NodeResources::subtract) - .with(host.flavor().resources().diskSpeed()).with(host.flavor().resources().storageType()); - } - - private static boolean isInactiveOrRetired(Node node) { - if (node.state() == Node.State.inactive) return true; - if (node.allocation().isPresent() && node.allocation().get().membership().retired()) return true; - return false; - } - -} diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java index e4b1e0fcbc0..004c74b5f70 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java @@ -34,7 +34,7 @@ public class EmptyProvisionServiceProvider implements ProvisionServiceProvider { private static class IdentityHostResourcesCalculator implements HostResourcesCalculator { @Override - public NodeResources realResourcesOf(Node node, NodeRepository repository) { return node.flavor().resources(); } + public NodeResources realResourcesOf(Node node, NodeRepository repository) { return node.resources(); } @Override public NodeResources advertisedResourcesOf(Flavor flavor) { return flavor.resources(); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java new file mode 100644 index 00000000000..4125345d492 --- /dev/null +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java @@ -0,0 +1,109 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.provision.provisioning; + +import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeType; +import com.yahoo.vespa.hosted.provision.LockedNodeList; +import com.yahoo.vespa.hosted.provision.Node; +import com.yahoo.vespa.hosted.provision.NodeList; + +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Capacity calculation for docker hosts. + *

+ * The calculations are based on an immutable copy of nodes that represents + * all capacities in the system - i.e. all nodes in the node repo. + * + * @author smorgrav + */ +public class HostCapacity { + + private final NodeList allNodes; + private final HostResourcesCalculator hostResourcesCalculator; + + public HostCapacity(NodeList allNodes, HostResourcesCalculator hostResourcesCalculator) { + this.allNodes = Objects.requireNonNull(allNodes, "allNodes must be non-null"); + this.hostResourcesCalculator = Objects.requireNonNull(hostResourcesCalculator, "hostResourcesCalculator must be non-null"); + } + + public NodeList allNodes() { return allNodes; } + + /** + * Spare hosts are the two hosts in the system with the most free capacity. + * + * We do not count retired or inactive nodes as used capacity (as they could have been + * moved to create space for the spare node in the first place). + * + * @param candidates the candidates to consider. This list may contain all kinds of nodes. + * @param count the max number of spare hosts to return + */ + public Set findSpareHosts(List candidates, int count) { + return candidates.stream() + .filter(node -> node.type() == NodeType.host) + .filter(dockerHost -> dockerHost.state() == Node.State.active) + .filter(dockerHost -> freeIPs(dockerHost) > 0) + .sorted(this::compareWithoutInactive) + .limit(count) + .collect(Collectors.toSet()); + } + + private int compareWithoutInactive(Node hostA, Node hostB) { + int result = compare(freeCapacityOf(hostB, true), freeCapacityOf(hostA, true)); + if (result != 0) return result; + + // If resources are equal we want to assign to the one with the most IP addresses free + return freeIPs(hostB) - freeIPs(hostA); + } + + private int compare(NodeResources a, NodeResources b) { + return NodeResourceComparator.defaultOrder().compare(a, b); + } + + /** + * Checks the node capacity and free ip addresses to see + * if we could allocate a flavor on the docker host. + */ + boolean hasCapacity(Node dockerHost, NodeResources requestedCapacity) { + return freeCapacityOf(dockerHost, false).satisfies(requestedCapacity) && freeIPs(dockerHost) > 0; + } + + /** + * Number of free (not allocated) IP addresses assigned to the dockerhost. + */ + int freeIPs(Node dockerHost) { + return dockerHost.ipAddressPool().findUnused(allNodes).size(); + } + + /** + * Calculate the remaining capacity of a host. + * + * @param host the host to find free capacity of. + * @return a default (empty) capacity if not a docker host, otherwise the free/unallocated/rest capacity + */ + public NodeResources freeCapacityOf(Node host) { + return freeCapacityOf(host, false); + } + + NodeResources freeCapacityOf(Node host, boolean excludeInactive) { + // Only hosts have free capacity + if ( ! host.type().canRun(NodeType.tenant)) return new NodeResources(0, 0, 0, 0); + + NodeResources hostResources = hostResourcesCalculator.advertisedResourcesOf(host.flavor()); + return allNodes.childrenOf(host).asList().stream() + .filter(node -> !(excludeInactive && isInactiveOrRetired(node))) + .map(node -> node.flavor().resources().justNumbers()) + .reduce(hostResources.justNumbers(), NodeResources::subtract) + .with(host.flavor().resources().diskSpeed()).with(host.flavor().resources().storageType()); + } + + private static boolean isInactiveOrRetired(Node node) { + if (node.state() == Node.State.inactive) return true; + if (node.allocation().isPresent() && node.allocation().get().membership().retired()) return true; + return false; + } + +} 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 47d1b30a8e7..df8a7e45917 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 @@ -148,7 +148,7 @@ class NodeAllocation { } node.node = offered.allocate(application, ClusterMembership.from(cluster, highestIndex.add(1)), - requestedNodes.resources().orElse(node.node.flavor().resources()), + requestedNodes.resources().orElse(node.node.resources()), nodeRepository.clock().instant()); accepted.add(acceptNode(node, false, false)); } @@ -242,7 +242,7 @@ class NodeAllocation { Node node = prioritizableNode.node; if (node.allocation().isPresent()) // Record the currently requested resources - node = node.with(node.allocation().get().withRequestedResources(requestedNodes.resources().orElse(node.flavor().resources()))); + node = node.with(node.allocation().get().withRequestedResources(requestedNodes.resources().orElse(node.resources()))); if (! wantToRetire) { accepted++; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 5e297900767..8560dd424e7 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -13,7 +13,6 @@ import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.IP; -import com.yahoo.vespa.hosted.provision.persistence.NameResolver; import java.util.EnumSet; import java.util.HashMap; @@ -21,7 +20,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; -import java.util.function.Predicate; import java.util.logging.Logger; import java.util.stream.Collectors; @@ -39,7 +37,7 @@ public class NodePrioritizer { private final Map nodes = new HashMap<>(); private final LockedNodeList allNodes; - private final DockerHostCapacity capacity; + private final HostCapacity capacity; private final NodeSpec requestedNodes; private final ApplicationId application; private final ClusterSpec clusterSpec; @@ -55,11 +53,11 @@ public class NodePrioritizer { NodePrioritizer(LockedNodeList allNodes, ApplicationId application, ClusterSpec clusterSpec, NodeSpec nodeSpec, int spares, int wantedGroups, boolean allocateFully, NodeRepository nodeRepository) { this.allNodes = allNodes; - this.capacity = new DockerHostCapacity(allNodes, nodeRepository.resourcesCalculator()); + this.capacity = new HostCapacity(allNodes, nodeRepository.resourcesCalculator()); this.requestedNodes = nodeSpec; this.clusterSpec = clusterSpec; this.application = application; - this.spareHosts = findSpareHosts(allNodes, capacity, spares); + this.spareHosts = capacity.findSpareHosts(allNodes.asList(), spares); this.allocateFully = allocateFully; this.nodeRepository = nodeRepository; @@ -83,22 +81,6 @@ public class NodePrioritizer { this.isDocker = resources(requestedNodes) != null; } - /** - * Spare hosts are the two hosts in the system with the most free capacity. - * - * We do not count retired or inactive nodes as used capacity (as they could have been - * moved to create space for the spare node in the first place). - */ - private static Set findSpareHosts(LockedNodeList nodes, DockerHostCapacity capacity, int spares) { - return nodes.asList().stream() - .filter(node -> node.type() == NodeType.host) - .filter(dockerHost -> dockerHost.state() == Node.State.active) - .filter(dockerHost -> capacity.freeIPs(dockerHost) > 0) - .sorted(capacity::compareWithoutInactive) - .limit(spares) - .collect(Collectors.toSet()); - } - /** Returns the list of nodes sorted by PrioritizableNode::compare */ List prioritize() { return nodes.values().stream().sorted().collect(Collectors.toList()); @@ -207,7 +189,7 @@ public class NodePrioritizer { if (!isNewNode) builder.resizable(! allocateFully - && requestedNodes.canResize(node.flavor().resources(), parentCapacity, isTopologyChange, currentClusterSize)); + && requestedNodes.canResize(node.resources(), parentCapacity, isTopologyChange, currentClusterSize)); if (spareHosts.contains(parent)) builder.violatesSpares(true); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java index a8abdc3f38a..9971aae1714 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java @@ -139,7 +139,7 @@ public interface NodeSpec { @Override public boolean needsResize(Node node) { - return ! node.flavor().resources().compatibleWith(requestedNodeResources); + return ! node.resources().compatibleWith(requestedNodeResources); } @Override diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java index 3fc60c1192d..0c1b396c40c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/PrioritizableNode.java @@ -126,7 +126,7 @@ class PrioritizableNode implements Comparable { double skewWithoutThis() { return skewWith(zeroResources); } /** Returns the allocation skew of the parent of this after adding this node to it */ - double skewWithThis() { return skewWith(node.flavor().resources()); } + double skewWithThis() { return skewWith(node.resources()); } private double skewWith(NodeResources resources) { if (parent.isEmpty()) return 0; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java index aa81aae84fe..a4161a318ab 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java @@ -43,7 +43,7 @@ public class ApplicationSerializer { if (nodes.isEmpty()) return; int groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count(); - ClusterResources currentResources = new ClusterResources(nodes.size(), groups, nodes.get(0).flavor().resources()); + ClusterResources currentResources = new ClusterResources(nodes.size(), groups, nodes.get(0).resources()); toSlime(cluster.minResources(), clusterObject.setObject("min")); toSlime(cluster.maxResources(), clusterObject.setObject("max")); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java index 7e81a9cc002..e28b03d7517 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/HostCapacityResponse.java @@ -129,7 +129,7 @@ public class HostCapacityResponse extends HttpResponse { ); failurePath.failureReason.tenant.ifPresent(tenant -> { object.setString("failedTenant", tenant.hostname()); - object.setString("failedTenantResources", tenant.flavor().resources().toString()); + object.setString("failedTenantResources", tenant.resources().toString()); tenant.allocation().ifPresent(allocation -> object.setString("failedTenantAllocation", allocation.toString()) ); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index cc5c6851a92..a0a44e4f342 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -383,7 +383,7 @@ public class AutoscalingTest { @Override public NodeResources realResourcesOf(Node node, NodeRepository nodeRepository) { - return node.flavor().resources(); + return node.resources(); } @Override diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java index b0e394c93d3..1137ae5ce2c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java @@ -208,9 +208,9 @@ class AutoscalingTester { @Override public NodeResources realResourcesOf(Node node, NodeRepository nodeRepository) { if (zone.getCloud().dynamicProvisioning()) - return node.flavor().resources().withMemoryGb(node.flavor().resources().memoryGb() - 3); + return node.resources().withMemoryGb(node.resources().memoryGb() - 3); else - return node.flavor().resources(); + return node.resources(); } @Override diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java index a6b2f6b15ea..464bdd6405a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java @@ -129,7 +129,7 @@ public class CapacityCheckerTester { childModel.parentHostname = Optional.of(hostname); Node childNode = createNodeFromModel(childModel); - childResources.add(childNode.flavor().resources()); + childResources.add(childNode.resources()); hosts.add(childNode); } @@ -275,7 +275,7 @@ public class CapacityCheckerTester { nodeModel.parentHostname, f, Optional.empty(), nodeModel.type); if (membership != null) { - return node.allocate(owner, membership, node.flavor().resources(), Instant.now()); + return node.allocate(owner, membership, node.resources(), Instant.now()); } else { return node; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java index 9fc2f666d27..727232e5c7c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java @@ -223,7 +223,7 @@ public class MetricsReporterTest { if (tenant.isPresent()) { Allocation allocation = new Allocation(app(tenant.get()), ClusterMembership.from("container/id1/0/3", new Version(), Optional.empty()), - owner.flavor().resources(), + owner.resources(), Generation.initial(), false); return Optional.of(allocation); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java index e2fd8a8721c..51f70e8b640 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailerTest.java @@ -301,9 +301,9 @@ public class NodeFailerTest { // Two ready nodes and a ready docker node die, but only 2 of those are failed out tester.clock.advance(Duration.ofMinutes(180)); - Node dockerNode = ready.stream().filter(node -> node.flavor().resources().equals(newNodeResources)).findFirst().get(); + Node dockerNode = ready.stream().filter(node -> node.resources().equals(newNodeResources)).findFirst().get(); List otherNodes = ready.stream() - .filter(node -> ! node.flavor().resources().equals(newNodeResources)) + .filter(node -> ! node.resources().equals(newNodeResources)) .collect(Collectors.toList()); tester.allNodesMakeAConfigRequestExcept(otherNodes.get(0), otherNodes.get(2), dockerNode); tester.failer.run(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java index ea4386f2fd5..644b2338a5a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/AllocationVisualizer.java @@ -102,13 +102,13 @@ public class AllocationVisualizer extends JPanel { if (isHost) { g.setColor(Color.GRAY); - for (int i = 0; i < node.flavor().resources().memoryGb(); i++) { + for (int i = 0; i < node.resources().memoryGb(); i++) { g.fillRect(x, y - nodeHeight, nodeWidth, nodeHeight); y = y - (nodeHeight + 2); } } else { g.setColor(Color.YELLOW); - int multi = (int) node.flavor().resources().memoryGb(); + int multi = (int) node.resources().memoryGb(); int height = multi * nodeHeight + ((multi - 1) * 2); g.fillRect(x, y - height, nodeWidth, height); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java deleted file mode 100644 index aef25daa659..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacityTest.java +++ /dev/null @@ -1,138 +0,0 @@ -// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.provisioning; - -import com.yahoo.config.provision.Flavor; -import com.yahoo.config.provision.NodeFlavors; -import com.yahoo.config.provision.NodeResources; -import com.yahoo.config.provision.NodeType; -import com.yahoo.vespa.hosted.provision.LockedNodeList; -import com.yahoo.vespa.hosted.provision.Node; -import com.yahoo.vespa.hosted.provision.node.IP; -import org.junit.Before; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.mock; - -/** - * @author smorgrav - */ -public class DockerHostCapacityTest { - - private final HostResourcesCalculator hostResourcesCalculator = mock(HostResourcesCalculator.class); - private DockerHostCapacity capacity; - private List nodes; - private Node host1, host2, host3; - private final NodeResources resources1 = new NodeResources(1, 30, 20, 1.5); - private final NodeResources resources2 = new NodeResources(2, 40, 40, 0.5); - - @Before - public void setup() { - doAnswer(invocation -> ((Flavor)invocation.getArguments()[0]).resources()).when(hostResourcesCalculator).advertisedResourcesOf(any()); - - // Create flavors - NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("host", "docker", "docker2"); - - // Create three docker hosts - host1 = Node.create("host1", new IP.Config(Set.of("::1"), generateIPs(2, 4)), "host1", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); - host2 = Node.create("host2", new IP.Config(Set.of("::11"), generateIPs(12, 3)), "host2", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); - host3 = Node.create("host3", new IP.Config(Set.of("::21"), generateIPs(22, 1)), "host3", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); - - // Add two containers to host1 - var nodeA = Node.createDockerNode(Set.of("::2"), "nodeA", "host1", resources1, NodeType.tenant); - var nodeB = Node.createDockerNode(Set.of("::3"), "nodeB", "host1", resources1, NodeType.tenant); - - // Add two containers to host 2 (same as host 1) - var nodeC = Node.createDockerNode(Set.of("::12"), "nodeC", "host2", resources1, NodeType.tenant); - var nodeD = Node.createDockerNode(Set.of("::13"), "nodeD", "host2", resources1, NodeType.tenant); - - // Add a larger container to host3 - var nodeE = Node.createDockerNode(Set.of("::22"), "nodeE", "host3", resources2, NodeType.tenant); - - // init docker host capacity - nodes = new ArrayList<>(List.of(host1, host2, host3, nodeA, nodeB, nodeC, nodeD, nodeE)); - capacity = new DockerHostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - } - - @Test - public void hasCapacity() { - assertTrue(capacity.hasCapacity(host1, resources1)); - assertTrue(capacity.hasCapacity(host1, resources2)); - assertTrue(capacity.hasCapacity(host2, resources1)); - assertTrue(capacity.hasCapacity(host2, resources2)); - assertFalse(capacity.hasCapacity(host3, resources1)); // No ip available - assertFalse(capacity.hasCapacity(host3, resources2)); // No ip available - - // Add a new node to host1 to deplete the memory resource - Node nodeF = Node.createDockerNode(Set.of("::6"), "nodeF", "host1", resources1, NodeType.tenant); - nodes.add(nodeF); - capacity = new DockerHostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - assertFalse(capacity.hasCapacity(host1, resources1)); - assertFalse(capacity.hasCapacity(host1, resources2)); - } - - @Test - public void freeIPs() { - assertEquals(2, capacity.freeIPs(host1)); - assertEquals(1, capacity.freeIPs(host2)); - assertEquals(0, capacity.freeIPs(host3)); - } - - @Test - public void freeCapacityOf() { - assertEquals(new NodeResources(5, 40, 80, 2, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), - capacity.freeCapacityOf(host1, false)); - assertEquals(new NodeResources(5, 60, 80, 4.5, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), - capacity.freeCapacityOf(host3, false)); - - doAnswer(invocation -> { - NodeResources totalHostResources = ((Flavor) invocation.getArguments()[0]).resources(); - return totalHostResources.subtract(new NodeResources(1, 2, 3, 0.5, NodeResources.DiskSpeed.any)); - }).when(hostResourcesCalculator).advertisedResourcesOf(any()); - - assertEquals(new NodeResources(4, 38, 77, 1.5, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), - capacity.freeCapacityOf(host1, false)); - assertEquals(new NodeResources(4, 58, 77, 4, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), - capacity.freeCapacityOf(host3, false)); - } - - @Test - public void devhostCapacityTest() { - // Dev host can assign both configserver and tenant containers. - - var nodeFlavors = FlavorConfigBuilder.createDummies("devhost", "container"); - var devHost = Node.create("devhost", new IP.Config(Set.of("::1"), generateIPs(2, 10)), "devhost", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("devhost"), Optional.empty(), NodeType.devhost); - - var cfg = Node.createDockerNode(Set.of("::2"), "cfg", "devhost", resources1, NodeType.config); - - var nodes = new ArrayList<>(List.of(cfg)); - var capacity = new DockerHostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - assertTrue(capacity.hasCapacity(devHost, resources1)); - - var container1 = Node.createDockerNode(Set.of("::3"), "container1", "devhost", resources1, NodeType.tenant); - nodes = new ArrayList<>(List.of(cfg, container1)); - capacity = new DockerHostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); - assertFalse(capacity.hasCapacity(devHost, resources1)); - - } - - private Set generateIPs(int start, int count) { - // Allow 4 containers - Set ipAddressPool = new LinkedHashSet<>(); - for (int i = start; i < (start + count); i++) { - ipAddressPool.add("::" + i); - } - return ipAddressPool; - } - -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java index 3ffb0dc34f0..0c5a682c3c5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java @@ -60,7 +60,7 @@ public class DockerProvisioningTest { NodeList nodes = tester.getNodes(application1, Node.State.active); assertEquals(nodeCount, nodes.size()); - assertEquals(dockerResources, nodes.asList().get(0).flavor().resources()); + assertEquals(dockerResources, nodes.asList().get(0).resources()); // Upgrade Vespa version on nodes Version upgradedWantedVespaVersion = Version.fromString("6.40"); @@ -70,7 +70,7 @@ public class DockerProvisioningTest { tester.activate(application1, new HashSet<>(upgradedHosts)); NodeList upgradedNodes = tester.getNodes(application1, Node.State.active); assertEquals(nodeCount, upgradedNodes.size()); - assertEquals(dockerResources, upgradedNodes.asList().get(0).flavor().resources()); + assertEquals(dockerResources, upgradedNodes.asList().get(0).resources()); assertEquals(hosts, upgradedHosts); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java index 7350df40718..98ec01e8e95 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerAllocationTest.java @@ -425,7 +425,7 @@ public class DynamicDockerAllocationTest { ); ClusterMembership clusterMembership1 = ClusterMembership.from( clusterSpec.with(Optional.of(ClusterSpec.Group.from(0))), index); // Need to add group here so that group is serialized in node allocation - Node node1aAllocation = node1a.allocate(id, clusterMembership1, node1a.flavor().resources(), Instant.now()); + Node node1aAllocation = node1a.allocate(id, clusterMembership1, node1a.resources(), Instant.now()); tester.nodeRepository().addNodes(Collections.singletonList(node1aAllocation), Agent.system); NestedTransaction transaction = new NestedTransaction().add(new CuratorTransaction(tester.getCurator())); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java new file mode 100644 index 00000000000..da78aff493e --- /dev/null +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacityTest.java @@ -0,0 +1,138 @@ +// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.vespa.hosted.provision.provisioning; + +import com.yahoo.config.provision.Flavor; +import com.yahoo.config.provision.NodeFlavors; +import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeType; +import com.yahoo.vespa.hosted.provision.LockedNodeList; +import com.yahoo.vespa.hosted.provision.Node; +import com.yahoo.vespa.hosted.provision.node.IP; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; + +/** + * @author smorgrav + */ +public class HostCapacityTest { + + private final HostResourcesCalculator hostResourcesCalculator = mock(HostResourcesCalculator.class); + private HostCapacity capacity; + private List nodes; + private Node host1, host2, host3; + private final NodeResources resources1 = new NodeResources(1, 30, 20, 1.5); + private final NodeResources resources2 = new NodeResources(2, 40, 40, 0.5); + + @Before + public void setup() { + doAnswer(invocation -> ((Flavor)invocation.getArguments()[0]).resources()).when(hostResourcesCalculator).advertisedResourcesOf(any()); + + // Create flavors + NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("host", "docker", "docker2"); + + // Create three docker hosts + host1 = Node.create("host1", new IP.Config(Set.of("::1"), generateIPs(2, 4)), "host1", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); + host2 = Node.create("host2", new IP.Config(Set.of("::11"), generateIPs(12, 3)), "host2", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); + host3 = Node.create("host3", new IP.Config(Set.of("::21"), generateIPs(22, 1)), "host3", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("host"), Optional.empty(), NodeType.host); + + // Add two containers to host1 + var nodeA = Node.createDockerNode(Set.of("::2"), "nodeA", "host1", resources1, NodeType.tenant); + var nodeB = Node.createDockerNode(Set.of("::3"), "nodeB", "host1", resources1, NodeType.tenant); + + // Add two containers to host 2 (same as host 1) + var nodeC = Node.createDockerNode(Set.of("::12"), "nodeC", "host2", resources1, NodeType.tenant); + var nodeD = Node.createDockerNode(Set.of("::13"), "nodeD", "host2", resources1, NodeType.tenant); + + // Add a larger container to host3 + var nodeE = Node.createDockerNode(Set.of("::22"), "nodeE", "host3", resources2, NodeType.tenant); + + // init docker host capacity + nodes = new ArrayList<>(List.of(host1, host2, host3, nodeA, nodeB, nodeC, nodeD, nodeE)); + capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); + } + + @Test + public void hasCapacity() { + assertTrue(capacity.hasCapacity(host1, resources1)); + assertTrue(capacity.hasCapacity(host1, resources2)); + assertTrue(capacity.hasCapacity(host2, resources1)); + assertTrue(capacity.hasCapacity(host2, resources2)); + assertFalse(capacity.hasCapacity(host3, resources1)); // No ip available + assertFalse(capacity.hasCapacity(host3, resources2)); // No ip available + + // Add a new node to host1 to deplete the memory resource + Node nodeF = Node.createDockerNode(Set.of("::6"), "nodeF", "host1", resources1, NodeType.tenant); + nodes.add(nodeF); + capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); + assertFalse(capacity.hasCapacity(host1, resources1)); + assertFalse(capacity.hasCapacity(host1, resources2)); + } + + @Test + public void freeIPs() { + assertEquals(2, capacity.freeIPs(host1)); + assertEquals(1, capacity.freeIPs(host2)); + assertEquals(0, capacity.freeIPs(host3)); + } + + @Test + public void freeCapacityOf() { + assertEquals(new NodeResources(5, 40, 80, 2, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), + capacity.freeCapacityOf(host1, false)); + assertEquals(new NodeResources(5, 60, 80, 4.5, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), + capacity.freeCapacityOf(host3, false)); + + doAnswer(invocation -> { + NodeResources totalHostResources = ((Flavor) invocation.getArguments()[0]).resources(); + return totalHostResources.subtract(new NodeResources(1, 2, 3, 0.5, NodeResources.DiskSpeed.any)); + }).when(hostResourcesCalculator).advertisedResourcesOf(any()); + + assertEquals(new NodeResources(4, 38, 77, 1.5, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), + capacity.freeCapacityOf(host1, false)); + assertEquals(new NodeResources(4, 58, 77, 4, NodeResources.DiskSpeed.fast, NodeResources.StorageType.remote), + capacity.freeCapacityOf(host3, false)); + } + + @Test + public void devhostCapacityTest() { + // Dev host can assign both configserver and tenant containers. + + var nodeFlavors = FlavorConfigBuilder.createDummies("devhost", "container"); + var devHost = Node.create("devhost", new IP.Config(Set.of("::1"), generateIPs(2, 10)), "devhost", Optional.empty(), Optional.empty(), nodeFlavors.getFlavorOrThrow("devhost"), Optional.empty(), NodeType.devhost); + + var cfg = Node.createDockerNode(Set.of("::2"), "cfg", "devhost", resources1, NodeType.config); + + var nodes = new ArrayList<>(List.of(cfg)); + var capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); + assertTrue(capacity.hasCapacity(devHost, resources1)); + + var container1 = Node.createDockerNode(Set.of("::3"), "container1", "devhost", resources1, NodeType.tenant); + nodes = new ArrayList<>(List.of(cfg, container1)); + capacity = new HostCapacity(new LockedNodeList(nodes, () -> {}), hostResourcesCalculator); + assertFalse(capacity.hasCapacity(devHost, resources1)); + + } + + private Set generateIPs(int start, int count) { + // Allow 4 containers + Set ipAddressPool = new LinkedHashSet<>(); + for (int i = start; i < (start + count); i++) { + ipAddressPool.add("::" + i); + } + return ipAddressPool; + } + +} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InPlaceResizeProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InPlaceResizeProvisionTest.java index b2ee298c19d..71c3ec37d65 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InPlaceResizeProvisionTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InPlaceResizeProvisionTest.java @@ -150,9 +150,9 @@ public class InPlaceResizeProvisionTest { assertEquals(6, appNodes.size()); // 4 nodes with large resources + 2 retired nodes with medium resources appNodes.forEach(node -> { if (node.allocation().get().membership().retired()) - assertEquals(new NodeResources(4, 8, 160, 1, fast, local), node.flavor().resources()); + assertEquals(new NodeResources(4, 8, 160, 1, fast, local), node.resources()); else - assertEquals(new NodeResources(8, 16, 320, 1, fast, local), node.flavor().resources()); + assertEquals(new NodeResources(8, 16, 320, 1, fast, local), node.resources()); initialHostnames.remove(node.hostname()); }); assertTrue("All initial nodes should still be allocated to the application", initialHostnames.isEmpty()); @@ -254,7 +254,7 @@ public class InPlaceResizeProvisionTest { private void assertSizeAndResources(NodeList nodes, int size, NodeResources resources) { assertEquals(size, nodes.size()); - nodes.forEach(n -> assertEquals(resources, n.flavor().resources())); + nodes.forEach(n -> assertEquals(resources, n.resources())); } private NodeList listCluster(ClusterSpec cluster) { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java index 48bd091011e..e45ea09d372 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImplTest.java @@ -140,7 +140,7 @@ public class InfraDeployerImplTest { Optional nodeWithAllocation = wantedVespaVersion.map(version -> { ClusterSpec clusterSpec = application.getClusterSpecWithVersion(version).with(Optional.of(ClusterSpec.Group.from(0))); ClusterMembership membership = ClusterMembership.from(clusterSpec, 1); - Allocation allocation = new Allocation(application.getApplicationId(), membership, node.flavor().resources(), Generation.initial(), false); + Allocation allocation = new Allocation(application.getApplicationId(), membership, node.resources(), Generation.initial(), false); return node.with(allocation); }); return nodeRepository.database().writeTo(state, nodeWithAllocation.orElse(node), Agent.system, Optional.empty()); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index 2427c0303c6..e73aeb05ce3 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -262,8 +262,8 @@ public class ProvisioningTester { nodeList.stream().map(n -> n.allocation().get().membership().cluster().group().get()).distinct().count()); for (Node node : nodeList) { var expected = new NodeResources(vcpu, memory, disk, bandwidth, diskSpeed, storageType); - assertTrue(explanation + ": Resources: Expected " + expected + " but was " + node.flavor().resources(), - expected.compatibleWith(node.flavor().resources())); + assertTrue(explanation + ": Resources: Expected " + expected + " but was " + node.resources(), + expected.compatibleWith(node.resources())); } } @@ -658,7 +658,7 @@ public class ProvisioningTester { @Override public NodeResources realResourcesOf(Node node, NodeRepository nodeRepository) { - NodeResources resources = node.flavor().resources(); + NodeResources resources = node.resources(); if (node.type() == NodeType.host) return resources; return resources.withMemoryGb(resources.memoryGb() - memoryTaxGb) .withDiskGb(resources.diskGb() - ( resources.storageType() == local ? localDiskTax : 0)); diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitHandler.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitHandler.java index ff84f5117dd..e652dc86ab2 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitHandler.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisitHandler.java @@ -19,9 +19,10 @@ import java.text.SimpleDateFormat; /** * An abstract class that can be subclassed by different visitor handlers. * - * @author Thomas Gundersen + * @author Thomas Gundersen */ public abstract class VdsVisitHandler { + boolean showProgress; boolean showStatistics; boolean abortOnClusterDown; @@ -33,8 +34,7 @@ public abstract class VdsVisitHandler { final VisitorControlHandler controlHandler = new ControlHandler(); - public VdsVisitHandler(boolean showProgress, boolean showStatistics, boolean abortOnClusterDown) - { + public VdsVisitHandler(boolean showProgress, boolean showStatistics, boolean abortOnClusterDown) { this.showProgress = showProgress; this.showStatistics = showStatistics; this.abortOnClusterDown = abortOnClusterDown; @@ -72,8 +72,7 @@ public abstract class VdsVisitHandler { return printLock; } - public void onDone() { - } + public void onDone() { } public String getProgressFileName() { return progressFileName; @@ -127,8 +126,7 @@ public abstract class VdsVisitHandler { } private String getDateTime() { - DateFormat dateFormat = - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzz"); + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss zzz"); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); Date date = new Date(); return dateFormat.format(date); @@ -140,14 +138,10 @@ public abstract class VdsVisitHandler { System.err.print('\r'); lastLineIsProgress = false; } - System.err.println("Visitor error (" + getDateTime() + "): " + - message); - if (abortOnClusterDown && - !isDone() && - (message.lastIndexOf("Could not resolve")>=0 || - message.lastIndexOf("don't allow external load")>=0)) { - System.err.println("Aborting visitor as " + - "--abortonclusterdown flag is set."); + System.err.println("Visitor error (" + getDateTime() + "): " + message); + if (abortOnClusterDown && !isDone() && (message.lastIndexOf("Could not resolve")>=0 || + message.lastIndexOf("don't allow external load")>=0)) { + System.err.println("Aborting visitor as --abortonclusterdown flag is set."); abort(); } } @@ -160,11 +154,12 @@ public abstract class VdsVisitHandler { if (code != CompletionCode.SUCCESS) { if (code == CompletionCode.ABORTED) { System.err.println("Visitor aborted: " + message); - } else if (code == CompletionCode.TIMEOUT) { + } + else if (code == CompletionCode.TIMEOUT) { System.err.println("Visitor timed out: " + message); - } else { - System.err.println("Visitor aborted due to unknown issue " - + code + ": " + message); + } + else { + System.err.println("Visitor aborted due to unknown issue " + code + ": " + message); } } else { if (showProgress) { -- cgit v1.2.3