diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-01 13:35:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-01 13:35:53 +0100 |
commit | 206ed4293cc0ec01d14dd8a18093fae19094d4cf (patch) | |
tree | b57a6fbb5a2ee4565e8498c99055014fbc98b9ea /config-model | |
parent | 31db1c671fac8e34f098f9d6d9797c2c1e05d433 (diff) | |
parent | 6e3e9e5309a934578ff91ce8ab01c11984816092 (diff) |
Merge pull request #26226 from vespa-engine/hmusum/config-model-cleanup-4
Do hostname check when adding a new host
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/Host.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java | 11 |
2 files changed, 6 insertions, 7 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 7dbab87fac0..047a6ef9bd5 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 @@ -34,8 +34,6 @@ public final class Host extends TreeConfigProducer<AnyConfigProducer> implements Objects.requireNonNull(hostname, "The host name of a host cannot be null"); this.runsConfigServer = runsConfigServer; this.hostname = hostname; - if (parent instanceof HostSystem) - ((HostSystem)parent).checkName(hostname); } public static Host createConfigServerHost(HostSystem hostSystem, String hostname) { diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java index b204aeaacf6..00a1078b294 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostSystem.java @@ -54,8 +54,8 @@ public class HostSystem extends TreeConfigProducer<Host> { this.isHosted = isHosted; } - void checkName(String hostname) { - if (isHosted) return; // Done in node-repo instead + String checkHostname(String hostname) { + if (isHosted) return hostname; // Done in node-repo instead if (doCheckIp) { BiConsumer<Level, String> logFunction = deployLogger::logApplicationPackage; @@ -71,6 +71,7 @@ public class HostSystem extends TreeConfigProducer<Host> { logFunction.accept(Level.WARNING, "Unable to lookup IP address of host: " + hostname); } } + return hostname; } @Override @@ -88,10 +89,10 @@ public class HostSystem extends TreeConfigProducer<Host> { } private HostResource addNewHost(HostSpec hostSpec) { - Host host = Host.createHost(this, hostSpec.hostname()); - HostResource hostResource = new HostResource(host, hostSpec); + String hostname = checkHostname(hostSpec.hostname()); + HostResource hostResource = new HostResource(Host.createHost(this, hostname), hostSpec); hostSpec.networkPorts().ifPresent(np -> hostResource.ports().addNetworkPorts(np)); - hostname2host.put(host.getHostname(), hostResource); + hostname2host.put(hostname, hostResource); return hostResource; } |