From eac92a3571819a59f923233b0f87b8582024ae9c Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Mon, 4 Jun 2018 09:02:16 +0000 Subject: do less reverse-lookups in DNS * with docker (and especially docker swarm) validating host names by doing reverse DNS lookups have become even less reliable, so just skip it, check only that the hostname isn't in "short" form. --- config-model/src/main/java/com/yahoo/vespa/model/Host.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/vespa/model/Host.java b/config-model/src/main/java/com/yahoo/vespa/model/Host.java index 0adfe9e4bdb..624a9fd4da7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/Host.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/Host.java @@ -42,16 +42,14 @@ public final class Host extends AbstractConfigProducer private void checkName(HostSystem parent, String hostname) { // Give a warning if the host does not exist - // Host exists - warn if given hostname is not a fully qualified one. - String canonical = hostname; try { - canonical = parent.getCanonicalHostname(hostname); + Object address = java.net.InetAddress.getByName(hostname); } catch (UnknownHostException e) { - deployLogger().log(Level.WARNING, "Unable to find canonical hostname of host: " + hostname); + deployLogger().log(Level.WARNING, "Unable to lookup IP address of host: " + hostname); } - if ((null != canonical) && (! hostname.equals(canonical))) { + if (! hostname.contains(".")) { deployLogger().log(Level.WARNING, "Host named '" + hostname + "' may not receive any config " + - "since it does not match its canonical hostname: " + canonical); + "since it is not a canonical hostname"); } } -- cgit v1.2.3