diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-21 17:45:32 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-08-21 17:45:32 +0200 |
commit | 5e18db660c9acb46a65d0cef8bc157750dd8c203 (patch) | |
tree | 4f414c8125270fbdf40492e02ed9340cfdd51ab5 /node-repository | |
parent | cc6c11c91e08ef9aa79c0d65e6c1a1729c4ec2aa (diff) |
Remove feature flag
Diffstat (limited to 'node-repository')
3 files changed, 4 insertions, 14 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 c9c6ec83248..06f47aea2b0 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 @@ -6,8 +6,6 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.Zone; -import com.yahoo.vespa.flags.FlagSource; -import com.yahoo.vespa.flags.Flags; import java.util.Arrays; import java.util.Optional; @@ -20,11 +18,9 @@ import java.util.Optional; public class CapacityPolicies { private final Zone zone; - private final FlagSource flagSource; - public CapacityPolicies(Zone zone, FlagSource flagSource) { + public CapacityPolicies(Zone zone) { this.zone = zone; - this.flagSource = flagSource; } public int decideSize(Capacity requestedCapacity, ClusterSpec.Type clusterType) { @@ -56,7 +52,7 @@ public class CapacityPolicies { private NodeResources defaultNodeResources(ClusterSpec.Type clusterType) { if (clusterType == ClusterSpec.Type.admin) - return nodeResourcesForAdminCluster(); + return new NodeResources(0.5, 2, 50, 0.3); return new NodeResources(1.5, 8, 50, 0.3); } @@ -84,9 +80,4 @@ public class CapacityPolicies { return nodeCount; } - private NodeResources nodeResourcesForAdminCluster() { - double memoryInGb = Flags.MEMORY_FOR_ADMIN_CLUSTER_NODES.bindTo(flagSource).value(); - return new NodeResources(0.5, memoryInGb, 50, 0.3); - } - } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index 29e37b76ac3..60c7f3450f6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -8,7 +8,6 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostFilter; import com.yahoo.config.provision.HostSpec; -import com.yahoo.config.provision.NodeFlavors; import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.NodeType; import com.yahoo.config.provision.ProvisionLogger; @@ -60,7 +59,7 @@ public class NodeRepositoryProvisioner implements Provisioner { public NodeRepositoryProvisioner(NodeRepository nodeRepository, Zone zone, ProvisionServiceProvider provisionServiceProvider, FlagSource flagSource) { this.nodeRepository = nodeRepository; - this.capacityPolicies = new CapacityPolicies(zone, flagSource); + this.capacityPolicies = new CapacityPolicies(zone); this.zone = zone; this.loadBalancerProvisioner = provisionServiceProvider.getLoadBalancerService().map(lbService -> new LoadBalancerProvisioner(nodeRepository, lbService)); this.preparer = new Preparer(nodeRepository, diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index 6bc7c5774ab..cad3ea1cd42 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -91,7 +91,7 @@ public class ProvisioningTester { this.orchestrator = orchestrator; ProvisionServiceProvider provisionServiceProvider = new MockProvisionServiceProvider(loadBalancerService, hostProvisioner); this.provisioner = new NodeRepositoryProvisioner(nodeRepository, zone, provisionServiceProvider, flagSource); - this.capacityPolicies = new CapacityPolicies(zone, new InMemoryFlagSource()); + this.capacityPolicies = new CapacityPolicies(zone); this.provisionLogger = new NullProvisionLogger(); this.loadBalancerService = loadBalancerService; } |