diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-04-28 22:45:20 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-04-28 22:45:20 +0200 |
commit | 5b65bebb1408d5217e303b8281751c252bb626ce (patch) | |
tree | 561bf150633f33fd5c0c814b1bae0306a1ddc19a | |
parent | 415c02613c96c081e86a665a51a667b0f95935d7 (diff) |
Aliases were not used here
4 files changed, 16 insertions, 45 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java index 0af042a3bd0..558e61fc1c2 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/HostsXmlProvisionerTest.java @@ -15,8 +15,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -56,14 +54,7 @@ public class HostsXmlProvisionerTest { Map<String, HostSpec> map = allocate(hostProvisioner, aliases); assertCorrectNumberOfHosts(map, 2); - for (HostSpec hostSpec : map.values()) { - if (hostSpec.hostname().equals("test2.yahoo.com")) { - assertThat(hostSpec.aliases().size(), is(2)); - } else { - assertThat(hostSpec.aliases().size(), is(1)); - } - } - assertThat(map.size(), is(2)); + assertEquals(2, map.size()); assertTrue(map.keySet().containsAll(aliases)); // 5 services, 3 host aliases, mapping to 2 host. @@ -71,13 +62,13 @@ public class HostsXmlProvisionerTest { map = allocate(hostProvisioner, aliases); assertCorrectNumberOfHosts(map, 2); - assertThat(map.size(), is(3)); + assertEquals(3, map.size()); assertTrue(map.keySet().containsAll(aliases)); // 5 services, 3 host aliases, mapping to 3 host. aliases = createAliases(Collections.singletonList("node4")); map = allocate(hostProvisioner, aliases); - assertThat(map.size(), is(3)); + assertEquals(3, map.size()); assertCorrectNumberOfHosts(map, 3); assertTrue(map.keySet().containsAll(aliases)); @@ -95,7 +86,7 @@ public class HostsXmlProvisionerTest { for (HostSpec host : hostToServiceMap.values()) { hostSet.add(host.hostname()); } - assertThat(hostSet.size(), is(expectedHostCount)); + assertEquals(expectedHostCount, hostSet.size()); } private HostsXmlProvisioner createProvisioner(String hosts) { @@ -129,7 +120,8 @@ public class HostsXmlProvisionerTest { public void require_singlenode_HostAlias_is_used_if_hosts_xml() { HostsXmlProvisioner hostProvisioner = createProvisioner(oneHost); HostSpec hostSpec = hostProvisioner.allocateHost(Container.SINGLENODE_CONTAINER_SERVICESPEC); - assertThat(hostSpec.hostname(), is("test1.yahoo.com")); + assertEquals("test1.yahoo.com", hostSpec.hostname()); } + } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index 11f8da95059..1818046e810 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -18,9 +18,6 @@ public class HostSpec implements Comparable<HostSpec> { /** The name of this host */ private final String hostname; - /** Aliases of this host */ - private final List<String> aliases; - private final NodeResources realResources; private final NodeResources advertisedResources; private final NodeResources requestedResources; @@ -35,8 +32,15 @@ public class HostSpec implements Comparable<HostSpec> { private final Optional<NetworkPorts> networkPorts; /** Create a host in a non-cloud system, where hosts are specified in config */ - public HostSpec(String hostname, List<String> aliases, Optional<NetworkPorts> networkPorts) { - this(hostname, aliases, + public HostSpec(String hostname, Optional<NetworkPorts> networkPorts) { + this(hostname, + NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(), + Optional.empty(), Optional.empty(), networkPorts, Optional.empty()); + } + + // TODO: Remove after May 2022 + public HostSpec(String hostname, List<String> ignored, Optional<NetworkPorts> networkPorts) { + this(hostname, NodeResources.unspecified(), NodeResources.unspecified(), NodeResources.unspecified(), Optional.empty(), Optional.empty(), networkPorts, Optional.empty()); } @@ -51,7 +55,6 @@ public class HostSpec implements Comparable<HostSpec> { Optional<NetworkPorts> networkPorts, Optional<DockerImage> dockerImageRepo) { this(hostname, - List.of(), realResources, advertisedResources, requestedResources, @@ -62,7 +65,6 @@ public class HostSpec implements Comparable<HostSpec> { } private HostSpec(String hostname, - List<String> aliases, NodeResources realResources, NodeResources advertisedResurces, NodeResources requestedResources, @@ -72,7 +74,6 @@ public class HostSpec implements Comparable<HostSpec> { Optional<DockerImage> dockerImageRepo) { if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified"); this.hostname = hostname; - this.aliases = List.copyOf(aliases); this.realResources = Objects.requireNonNull(realResources); this.advertisedResources = Objects.requireNonNull(advertisedResurces); this.requestedResources = Objects.requireNonNull(requestedResources, "RequestedResources cannot be null"); @@ -85,9 +86,6 @@ public class HostSpec implements Comparable<HostSpec> { /** Returns the name identifying this host */ public String hostname() { return hostname; } - /** Returns the aliases of this host as an immutable list. This may be empty but never null. */ - public List<String> aliases() { return aliases; } - /** The real resources available for Vespa processes on this node, after subtracting infrastructure overhead. */ public NodeResources realResources() { return realResources; } @@ -109,13 +107,12 @@ public class HostSpec implements Comparable<HostSpec> { public Optional<DockerImage> dockerImageRepo() { return dockerImageRepo; } public HostSpec withPorts(Optional<NetworkPorts> ports) { - return new HostSpec(hostname, aliases, realResources, advertisedResources, requestedResources, membership, version, ports, dockerImageRepo); + return new HostSpec(hostname, realResources, advertisedResources, requestedResources, membership, version, ports, dockerImageRepo); } @Override public String toString() { return hostname + - (! aliases.isEmpty() ? " (aliases: " + aliases + ")" : "") + (membership.isPresent() ? " (membership: " + membership.get() + ")" : " (no membership)"); } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java index d7d8d9647d3..5db7303f4bf 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializer.java @@ -39,7 +39,6 @@ public class AllocatedHostsSerializer { private static final String mappingKey = "mapping"; private static final String hostSpecKey = "hostSpec"; private static final String hostSpecHostNameKey = "hostName"; - private static final String aliasesKey = "aliases"; private static final String hostSpecMembershipKey = "membership"; private static final String realResourcesKey = "realResources"; @@ -78,7 +77,6 @@ public class AllocatedHostsSerializer { private static void toSlime(HostSpec host, Cursor object) { object.setString(hostSpecHostNameKey, host.hostname()); - aliasesToSlime(host, object); host.membership().ifPresent(membership -> { object.setString(hostSpecMembershipKey, membership.stringValue()); object.setString(hostSpecVespaVersionKey, membership.cluster().vespaVersion().toFullString()); @@ -91,13 +89,6 @@ public class AllocatedHostsSerializer { host.networkPorts().ifPresent(ports -> NetworkPortsSerializer.toSlime(ports, object.setArray(hostSpecNetworkPortsKey))); } - private static void aliasesToSlime(HostSpec spec, Cursor cursor) { - if (spec.aliases().isEmpty()) return; - Cursor aliases = cursor.setArray(aliasesKey); - for (String alias : spec.aliases()) - aliases.addString(alias); - } - private static void toSlime(NodeResources resources, Cursor resourcesObject) { resourcesObject.setDouble(vcpuKey, resources.vcpu()); resourcesObject.setDouble(memoryKey, resources.memoryGb()); @@ -135,18 +126,10 @@ public class AllocatedHostsSerializer { } else { return new HostSpec(object.field(hostSpecHostNameKey).asString(), - aliasesFromSlime(object), NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey))); } } - private static List<String> aliasesFromSlime(Inspector object) { - if ( ! object.field(aliasesKey).valid()) return List.of(); - List<String> aliases = new ArrayList<>(); - object.field(aliasesKey).traverse((ArrayTraverser)(index, alias) -> aliases.add(alias.asString())); - return aliases; - } - private static NodeResources nodeResourcesFromSlime(Inspector resources) { return new NodeResources(resources.field(vcpuKey).asDouble(), resources.field(memoryKey).asDouble(), diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java index 3867664a3a6..ed87ff9f555 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java @@ -98,7 +98,6 @@ public class AllocatedHostsSerializerTest { assertEquals(expectedHost.requestedResources(), deserializedHost.requestedResources()); assertEquals(expectedHost.version(), deserializedHost.version()); assertEquals(expectedHost.networkPorts(), deserializedHost.networkPorts()); - assertEquals(expectedHost.aliases(), deserializedHost.aliases()); assertEquals(expectedHost.dockerImageRepo(), deserializedHost.dockerImageRepo()); } } |