diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-05-12 14:33:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-12 14:33:36 +0200 |
commit | da22a55e6f213b7804f61d2fb3523b5d2924d39c (patch) | |
tree | 4dbc687e6ea9b03f8a5f192990f40c1494712b6c /node-repository | |
parent | cc26e57914df77549f439730bde10b2a908eddfb (diff) |
Revert "Decide default flavours based on requested Vespa version"
Diffstat (limited to 'node-repository')
2 files changed, 8 insertions, 43 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index aa9fac660f6..6748b6a2029 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.provisioning; -import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterResources; @@ -13,14 +12,11 @@ import com.yahoo.vespa.flags.FlagSource; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.hosted.provision.NodeRepository; -import java.util.Map; -import java.util.TreeMap; import java.util.function.Function; import static com.yahoo.config.provision.NodeResources.Architecture; import static com.yahoo.vespa.flags.FetchVector.Dimension.APPLICATION_ID; import static com.yahoo.vespa.flags.PermanentFlags.ADMIN_CLUSTER_NODE_ARCHITECTURE; -import static java.util.Objects.requireNonNull; /** * Defines the policies for assigning cluster capacity in various environments @@ -87,27 +83,17 @@ public class CapacityPolicies { .with(APPLICATION_ID, applicationId.serializedForm()) .value()); - if (clusterSpec.id().value().equals("cluster-controllers")) { - return versioned(clusterSpec, Map.of(new Version("1"), new NodeResources(0.25, 1.14, 10, 0.3))) - .with(architecture); - } + if (clusterSpec.id().value().equals("cluster-controllers")) + return new NodeResources(0.25, 1.14, 10, 0.3).with(architecture); - return (zone.getCloud().dynamicProvisioning() && ! sharedHosts.apply(clusterSpec.type()) - ? versioned(clusterSpec, Map.of(new Version("1"), new NodeResources(0.5, 4, 50, 0.3))) - : versioned(clusterSpec, Map.of(new Version("1"), new NodeResources(0.5, 2, 50, 0.3)))) - .with(architecture); + return zone.getCloud().dynamicProvisioning() && ! sharedHosts.apply(clusterSpec.type()) ? + new NodeResources(0.5, 4, 50, 0.3).with(architecture) : + new NodeResources(0.5, 2, 50, 0.3).with(architecture); } - return zone.getCloud().dynamicProvisioning() - ? versioned(clusterSpec, Map.of(new Version("1"), new NodeResources(2.0, 8, 50, 0.3))) - : versioned(clusterSpec, Map.of(new Version("1"), new NodeResources(1.5, 8, 50, 0.3))); - } - - /** Returns the resources for the newest version not newer than that requested in the cluster spec. */ - static NodeResources versioned(ClusterSpec spec, Map<Version, NodeResources> resources) { - return requireNonNull(new TreeMap<>(resources).floorEntry(spec.vespaVersion()), - "no default resources applicable for " + spec + " among: " + resources) - .getValue(); + return zone.getCloud().dynamicProvisioning() ? + new NodeResources(2.0, 8, 50, 0.3) : + new NodeResources(1.5, 8, 50, 0.3); } /** diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 34219a15caa..94822c85a03 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -7,9 +7,6 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterMembership; import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; -import com.yahoo.config.provision.ClusterSpec.Group; -import com.yahoo.config.provision.ClusterSpec.Id; -import com.yahoo.config.provision.ClusterSpec.Type; import com.yahoo.config.provision.DockerImage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; @@ -40,7 +37,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Random; import java.util.Set; @@ -53,7 +49,6 @@ import static java.time.temporal.ChronoUnit.MILLIS; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -1025,22 +1020,6 @@ public class ProvisioningTest { tester.activate(application, state.allHosts); } - @Test - public void test_versioned_resources() { - ClusterSpec.Builder spec = ClusterSpec.specification(Type.container, Id.from("id")).group(Group.from(0)); - Map<Version, NodeResources> resources = Map.of(new Version("7"), new NodeResources(2, 2, 2, 2), - new Version("8"), new NodeResources(3, 3, 3, 3), - new Version("6"), new NodeResources(1, 1, 1, 1)); - - assertThrows(NullPointerException.class, - () -> CapacityPolicies.versioned(spec.vespaVersion("5.0").build(), resources)); - assertEquals(new NodeResources(1, 1, 1, 1), CapacityPolicies.versioned(spec.vespaVersion("6.0").build(), resources)); - assertEquals(new NodeResources(2, 2, 2, 2), CapacityPolicies.versioned(spec.vespaVersion("7.0").build(), resources)); - assertEquals(new NodeResources(2, 2, 2, 2), CapacityPolicies.versioned(spec.vespaVersion("7.1").build(), resources)); - assertEquals(new NodeResources(3, 3, 3, 3), CapacityPolicies.versioned(spec.vespaVersion("8.0").build(), resources)); - assertEquals(new NodeResources(3, 3, 3, 3), CapacityPolicies.versioned(spec.vespaVersion("9.0").build(), resources)); - } - private SystemState prepare(ApplicationId application, int container0Size, int container1Size, int content0Size, int content1Size, NodeResources flavor, ProvisioningTester tester) { return prepare(application, tester, container0Size, container1Size, content0Size, content1Size, flavor, "6.42"); |