diff options
Diffstat (limited to 'node-repository/src/main/java')
7 files changed, 69 insertions, 29 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index 7f595b4a541..6d04685189f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -111,7 +111,10 @@ public class NodeRepository extends AbstractComponent { /** Returns the Docker image to use for nodes in this */ public DockerImage dockerImage() { return dockerImage; } - + + /** @return The name resolver used to resolve hostname and ip addresses */ + public NameResolver nameResolver() { return nameResolver; } + // ---------------- Query API ---------------------------------------------------------------- /** @@ -258,6 +261,7 @@ public class NodeRepository extends AbstractComponent { if (ipAddresses.isEmpty()) { ipAddresses = nameResolver.getAllByNameOrThrow(hostname); } + return Node.create(openStackId, ImmutableSet.copyOf(ipAddresses), additionalIpAddresses, hostname, parentHostname, flavor, type); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/DnsNameResolver.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/DnsNameResolver.java index 6486343150c..f0165673aa9 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/DnsNameResolver.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/DnsNameResolver.java @@ -2,14 +2,19 @@ package com.yahoo.vespa.hosted.provision.persistence; import com.google.common.collect.ImmutableSet; +import com.google.common.net.InetAddresses; +import com.yahoo.log.LogLevel; import javax.naming.NamingException; import javax.naming.directory.Attribute; import javax.naming.directory.Attributes; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Optional; import java.util.Set; +import java.util.logging.Logger; /** * Implementation of a name resolver that always uses a DNS server to resolve the given name. The intention is to avoid @@ -19,7 +24,8 @@ import java.util.Set; */ public class DnsNameResolver implements NameResolver { - /** Resolve IP addresses for given host name */ + private static Logger logger = Logger.getLogger(DnsNameResolver.class.getName()); + @Override public Set<String> getAllByNameOrThrow(String hostname) { try { @@ -39,6 +45,18 @@ public class DnsNameResolver implements NameResolver { } } + @Override + public Optional<String> getHostname(String ipAddress) { + try { + String hostname = InetAddress.getByName(ipAddress).getHostName(); + return InetAddresses.isInetAddress(hostname) ? Optional.empty() : Optional.of(hostname); + } catch (UnknownHostException e) { + // This is not an exceptional state hence the debug level + logger.log(LogLevel.DEBUG, "Unable to resolve ipaddress", e); + } + return Optional.empty(); + } + private Optional<String> lookupName(String name, Type type) throws NamingException { DirContext ctx = new InitialDirContext(); Attributes attributes = ctx.getAttributes("dns:/" + name, new String[]{type.value}); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NameResolver.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NameResolver.java index b079ebc1100..32451bf4946 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NameResolver.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NameResolver.java @@ -1,15 +1,30 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.persistence; +import java.util.Optional; import java.util.Set; /** - * Interface for a basic name to IP address resolver. + * Interface for a hostname/ip resolver. * * @author mpolden */ public interface NameResolver { + /** + * Get IP addresses for given host name + * + * @param hostname The hostname to resolve + * @return A set of IPv4 or IPv6 addresses + */ Set<String> getAllByNameOrThrow(String hostname); + /** + * Get hostname from IP address. + * + * @param ipAddress The IPv4 or IPv6 address for the host + * @return Empty if the IP does not resolve or the hostname if it does + */ + Optional<String> getHostname(String ipAddress); + } 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 c5d60c30356..0bf48b805aa 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 @@ -58,7 +58,8 @@ class GroupPreparer { cluster, requestedNodes, nodeRepository.getAvailableFlavors(), - nofSpares); + nofSpares, + nodeRepository.nameResolver()); prioritizer.addApplicationNodes(); prioritizer.addSurplusNodes(surplusActiveNodes); 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 3df79174b5c..7d5cd85a783 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 @@ -8,9 +8,8 @@ import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; +import com.yahoo.vespa.hosted.provision.persistence.NameResolver; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -30,7 +29,7 @@ import java.util.stream.Collectors; * * @author smorgrav */ -class NodePrioritizer { +public class NodePrioritizer { private final Map<Node, PrioritizableNode> nodes = new HashMap<>(); private final List<Node> allNodes; @@ -38,18 +37,18 @@ class NodePrioritizer { private final NodeSpec requestedNodes; private final ApplicationId appId; private final ClusterSpec clusterSpec; - + private final NameResolver nameResolver; private final boolean isDocker; private final boolean isAllocatingForReplacement; private final Set<Node> spareHosts; private final Map<Node, ResourceCapacity> headroomHosts; - NodePrioritizer(List<Node> allNodes, ApplicationId appId, ClusterSpec clusterSpec, NodeSpec nodeSpec, NodeFlavors nodeFlavors, int spares) { + NodePrioritizer(List<Node> allNodes, ApplicationId appId, ClusterSpec clusterSpec, NodeSpec nodeSpec, NodeFlavors nodeFlavors, int spares, NameResolver nameResolver) { this.allNodes = Collections.unmodifiableList(allNodes); this.requestedNodes = nodeSpec; this.clusterSpec = clusterSpec; this.appId = appId; - + this.nameResolver = nameResolver; this.spareHosts = findSpareHosts(allNodes, spares); this.headroomHosts = findHeadroomHosts(allNodes, spareHosts, nodeFlavors); @@ -73,20 +72,6 @@ class NodePrioritizer { } /** - * From ipAddress - get hostname - * - * @return hostname or null if not able to do the lookup - */ - private static String lookupHostname(String ipAddress) { - try { - return InetAddress.getByName(ipAddress).getHostName(); - } catch (UnknownHostException e) { - e.printStackTrace(); - } - return 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 @@ -205,10 +190,10 @@ class NodePrioritizer { Set<String> ipAddresses = DockerHostCapacity.findFreeIps(node, allNodes); if (ipAddresses.isEmpty()) continue; String ipAddress = ipAddresses.stream().findFirst().get(); - String hostname = lookupHostname(ipAddress); - if (hostname == null) continue; + Optional<String> hostname = nameResolver.getHostname(ipAddress); + if (!hostname.isPresent()) continue; Node newNode = Node.createDockerNode("fake-" + hostname, Collections.singleton(ipAddress), - Collections.emptySet(), hostname, Optional.of(node.hostname()), getFlavor(requestedNodes), NodeType.tenant); + Collections.emptySet(), hostname.get(), Optional.of(node.hostname()), getFlavor(requestedNodes), NodeType.tenant); PrioritizableNode nodePri = toNodePriority(newNode, false, true); if (!nodePri.violatesSpares || isAllocatingForReplacement) { nodes.put(newNode, nodePri); @@ -233,7 +218,7 @@ class NodePrioritizer { } /** - * Add nodes already provisioned, but not allocatied to any application + * Add nodes already provisioned, but not allocated to any application */ void addReadyNodes() { allNodes.stream() diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java index b5c10bb7755..d2d2da813d8 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNameResolver.java @@ -10,7 +10,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; +import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; /** @@ -56,11 +58,25 @@ public class MockNameResolver implements NameResolver { return records.get(hostname); } if (mockAnyLookup) { - return Collections.singleton(randomIpAddress()); + Set<String> ipAddresses = Collections.singleton(randomIpAddress()); + records.put(hostname, ipAddresses); + return ipAddresses; } throw new RuntimeException(new UnknownHostException("Could not resolve: " + hostname)); } + @Override + public Optional<String> getHostname(String ipAddress) { + for (String host : records.keySet()) { + if (records.get(host).contains(ipAddress)) return Optional.of(host); + } + if (mockAnyLookup) { + String hostname = UUID.randomUUID().toString(); + records.put(hostname, Collections.singleton(ipAddress)); + } + return Optional.empty(); + } + private static String randomIpAddress() { // Generate a random IP in 127/8 (loopback block) ThreadLocalRandom random = ThreadLocalRandom.current(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java index 0885b941401..bcc18cfd876 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockNodeRepository.java @@ -105,6 +105,7 @@ public class MockNodeRepository extends NodeRepository { nodes.remove(7); nodes = setDirty(nodes); setReady(nodes); + fail("host5.yahoo.com", Agent.system, "Failing to unit test"); setDirty("host55.yahoo.com"); |