summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2018-06-08 12:53:48 +0200
committerGitHub <noreply@github.com>2018-06-08 12:53:48 +0200
commit87ccad88a9f9c30a9fb924d1f2e5638f8930406a (patch)
tree5a96572ae2a95d57d7c737bc5fe1a3c8851eb4bb
parent05091063afc80e18f58751ed50d2b4d8f400fe39 (diff)
parenteac92a3571819a59f923233b0f87b8582024ae9c (diff)
Merge pull request #6069 from vespa-engine/arnej/perform-less-reverse-DNS-lookups
do less reverse-lookups in DNS
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/Host.java10
1 files changed, 4 insertions, 6 deletions
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<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");
}
}