From 2e41de81b19e137638fa053e82b9a3e960b0c0bd Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Tue, 18 Aug 2020 13:10:18 +0200 Subject: Remove use of flavors from allocated hosts serialization --- .../java/com/yahoo/config/provision/HostSpec.java | 7 +-- .../serialization/AllocatedHostsSerializer.java | 31 ++++--------- .../AllocatedHostsSerializerTest.java | 51 ++++++++-------------- 3 files changed, 32 insertions(+), 57 deletions(-) (limited to 'config-provisioning/src') 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 fa684ff6046..6bc3809bd54 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 @@ -45,15 +45,16 @@ public class HostSpec implements Comparable { /** Create a host in a hosted system */ public HostSpec(String hostname, NodeResources realResources, - NodeResources advertisedResurces, + NodeResources advertisedResources, NodeResources requestedResources, ClusterMembership membership, Optional version, Optional networkPorts, Optional dockerImageRepo) { - this(hostname, List.of(), + this(hostname, + List.of(), realResources, - advertisedResurces, + advertisedResources, requestedResources, Optional.of(membership), version, 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 96b189cefe6..6cbd7fba6ff 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 @@ -16,7 +16,6 @@ import com.yahoo.slime.SlimeUtils; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; @@ -93,7 +92,7 @@ public class AllocatedHostsSerializer { object.setString(hostSpecDockerImageRepoKey, repo.repository()); }); }); - host.flavor().ifPresent(flavor -> toSlime(flavor, object)); // TODO: Remove this line after June 2020 + host.flavor().ifPresent(flavor -> toSlime(flavor, object)); // TODO: Remove this line when 7.272 has been released toSlime(host.realResources(), object.setObject(realResourcesKey)); toSlime(host.advertisedResources(), object.setObject(advertisedResourcesKey)); host.requestedResources().ifPresent(resources -> toSlime(resources, object.setObject(requestedResourcesKey))); @@ -124,25 +123,25 @@ public class AllocatedHostsSerializer { resourcesObject.setString(storageTypeKey, storageTypeToString(resources.storageType())); } - public static AllocatedHosts fromJson(byte[] json, Optional nodeFlavors) { - return fromSlime(SlimeUtils.jsonToSlime(json).get(), nodeFlavors); + public static AllocatedHosts fromJson(byte[] json) { + return fromSlime(SlimeUtils.jsonToSlime(json).get()); } - public static AllocatedHosts fromSlime(Inspector inspector, Optional nodeFlavors) { + public static AllocatedHosts fromSlime(Inspector inspector) { Inspector array = inspector.field(mappingKey); Set hosts = new LinkedHashSet<>(); array.traverse((ArrayTraverser)(i, host) -> { - hosts.add(hostFromSlime(host.field(hostSpecKey), nodeFlavors)); + hosts.add(hostFromSlime(host.field(hostSpecKey))); }); return AllocatedHosts.withHosts(hosts); } - private static HostSpec hostFromSlime(Inspector object, Optional nodeFlavors) { + private static HostSpec hostFromSlime(Inspector object) { if (object.field(hostSpecMembershipKey).valid()) { // Hosted return new HostSpec(object.field(hostSpecHostNameKey).asString(), - nodeResourcesFromSlime(object.field(realResourcesKey), object, nodeFlavors), - nodeResourcesFromSlime(object.field(advertisedResourcesKey), object, nodeFlavors), - optionalNodeResourcesFromSlime(object.field(requestedResourcesKey)), // TODO: Make non-optional after June 2020 + nodeResourcesFromSlime(object.field(realResourcesKey)), + nodeResourcesFromSlime(object.field(advertisedResourcesKey)), + nodeResourcesFromSlime(object.field(requestedResourcesKey)), membershipFromSlime(object), optionalString(object.field(hostSpecCurrentVespaVersionKey)).map(com.yahoo.component.Version::new), NetworkPortsSerializer.fromSlime(object.field(hostSpecNetworkPortsKey)), @@ -178,18 +177,6 @@ public class AllocatedHostsSerializer { storageTypeFromSlime(resources.field(storageTypeKey))); } - private static NodeResources optionalNodeResourcesFromSlime(Inspector resources) { - if ( ! resources.valid()) return NodeResources.unspecified(); - return nodeResourcesFromSlime(resources); - } - - private static NodeResources nodeResourcesFromSlime(Inspector resources, Inspector parent, - Optional nodeFlavors) { - if ( ! resources.valid()) // TODO: Remove the fallback using nodeFlavors after June 2020 - return flavorFromSlime(parent, nodeFlavors).map(f -> f.resources()).orElse(NodeResources.unspecified); - return nodeResourcesFromSlime(resources); - } - private static NodeResources.DiskSpeed diskSpeedFromSlime(Inspector diskSpeed) { switch (diskSpeed.asString()) { case "fast" : return NodeResources.DiskSpeed.fast; 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 30810b79104..b3351f0c1e1 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 @@ -5,12 +5,9 @@ import com.yahoo.component.Version; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NetworkPorts; -import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeResources; -import com.yahoo.config.provisioning.FlavorsConfig; import org.junit.Test; import java.io.IOException; @@ -28,42 +25,45 @@ import static org.junit.Assert.assertEquals; */ public class AllocatedHostsSerializerTest { + private static final NodeResources slowSmallNode = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow); + private static final NodeResources slowBiggerNode = new NodeResources(1.0, 6.2, 8, 2, NodeResources.DiskSpeed.slow); + private static final NodeResources fastNode = new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any); + @Test public void testAllocatedHostsSerialization() throws IOException { - NodeFlavors configuredFlavors = configuredFlavorsFrom("C/12/45/100", 12, 45, 100, 50, Flavor.Type.BARE_METAL); Set hosts = new LinkedHashSet<>(); hosts.add(new HostSpec("empty", List.of(), Optional.empty())); hosts.add(new HostSpec("with-aliases", List.of("alias1", "alias2"), Optional.empty())); hosts.add(new HostSpec("allocated", - NodeResources.unspecified(), - NodeResources.unspecified(), - NodeResources.unspecified(), + slowSmallNode, + slowBiggerNode, + fastNode, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar"))), Optional.empty(), Optional.empty(), Optional.of(DockerImage.fromString("docker.foo.com:4443/vespa/bar")))); hosts.add(new HostSpec("flavor-from-resources-2", - new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.slow), - new NodeResources(1.0, 6.2, 8, 2, NodeResources.DiskSpeed.slow), - new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any), + slowSmallNode, + slowBiggerNode, + fastNode, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.empty()), Optional.empty(), Optional.empty(), Optional.empty())); hosts.add(new HostSpec("with-version", - NodeResources.unspecified(), - NodeResources.unspecified(), - NodeResources.unspecified(), + slowSmallNode, + slowBiggerNode, + fastNode, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.empty()), Optional.of(Version.fromString("3.4.5")), Optional.empty(), Optional.empty())); hosts.add(new HostSpec("with-ports", - NodeResources.unspecified(), - NodeResources.unspecified(), - NodeResources.unspecified(), + slowSmallNode, + slowBiggerNode, + fastNode, ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"), Optional.empty()), Optional.empty(), @@ -71,11 +71,11 @@ public class AllocatedHostsSerializerTest { new NetworkPorts.Allocation(4567, "service2", "configId2", "suffix2")))), Optional.empty())); - assertAllocatedHosts(AllocatedHosts.withHosts(hosts), configuredFlavors); + assertAllocatedHosts(AllocatedHosts.withHosts(hosts)); } - private void assertAllocatedHosts(AllocatedHosts expectedHosts, NodeFlavors configuredFlavors) throws IOException { - AllocatedHosts deserializedHosts = fromJson(toJson(expectedHosts), Optional.of(configuredFlavors)); + private void assertAllocatedHosts(AllocatedHosts expectedHosts) throws IOException { + AllocatedHosts deserializedHosts = fromJson(toJson(expectedHosts)); assertEquals(expectedHosts, deserializedHosts); for (HostSpec expectedHost : expectedHosts.getHosts()) { @@ -99,17 +99,4 @@ public class AllocatedHostsSerializerTest { throw new IllegalArgumentException("No host " + hostname + " is present"); } - private NodeFlavors configuredFlavorsFrom(String flavorName, double cpu, double mem, double disk, double bandwidth, Flavor.Type type) { - FlavorsConfig.Builder b = new FlavorsConfig.Builder(); - FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder(); - flavor.name(flavorName); - flavor.minDiskAvailableGb(disk); - flavor.minCpuCores(cpu); - flavor.minMainMemoryAvailableGb(mem); - flavor.bandwidth(bandwidth); - flavor.environment(type.name()); - b.flavor(flavor); - return new NodeFlavors(b.build()); - } - } -- cgit v1.2.3