diff options
Diffstat (limited to 'node-repository')
3 files changed, 8 insertions, 4 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 77ca4b01cf2..6cee3005e91 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 @@ -8,6 +8,8 @@ import com.yahoo.config.provision.NodeResources; import com.yahoo.config.provision.Zone; import com.yahoo.config.provision.NodeFlavors; +import com.yahoo.vespa.flags.FlagSource; +import com.yahoo.vespa.flags.Flags; import java.util.Arrays; import java.util.Optional; @@ -21,10 +23,12 @@ public class CapacityPolicies { private final Zone zone; private final NodeFlavors flavors; + private final FlagSource flagSource; - public CapacityPolicies(Zone zone, NodeFlavors flavors) { + public CapacityPolicies(Zone zone, NodeFlavors flavors, FlagSource flagSource) { this.zone = zone; this.flavors = flavors; + this.flagSource = flagSource; } public int decideSize(Capacity requestedCapacity, ClusterSpec.Type clusterType) { @@ -105,7 +109,7 @@ public class CapacityPolicies { } private NodeResources nodeResourcesForAdminCluster() { - double memoryInGb = (zone.system().isCd() ? 2 : 3); + double memoryInGb = Flags.MEMORY_FOR_ADMIN_CLUSTER_NODES.bindTo(flagSource).value(); return new NodeResources(0.5, memoryInGb, 50); } 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 90ca8ef4d33..1cf5cfbb4f3 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 @@ -60,7 +60,7 @@ public class NodeRepositoryProvisioner implements Provisioner { public NodeRepositoryProvisioner(NodeRepository nodeRepository, NodeFlavors flavors, Zone zone, ProvisionServiceProvider provisionServiceProvider, FlagSource flagSource) { this.nodeRepository = nodeRepository; - this.capacityPolicies = new CapacityPolicies(zone, flavors); + this.capacityPolicies = new CapacityPolicies(zone, flavors, flagSource); 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 294c153f86f..9428af306a1 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, nodeFlavors, zone, provisionServiceProvider, flagSource); - this.capacityPolicies = new CapacityPolicies(zone, nodeFlavors); + this.capacityPolicies = new CapacityPolicies(zone, nodeFlavors, new InMemoryFlagSource()); this.provisionLogger = new NullProvisionLogger(); this.loadBalancerService = loadBalancerService; } |