diff options
| author | jonmv <venstad@gmail.com> | 2023-10-24 13:56:54 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-10-24 13:56:54 +0200 |
| commit | 613e6c34dd3eae9ff7ae67d4f1409672a859eafb (patch) | |
| tree | 529bb3e913f98fd4656c0936b28c216bb3ee1b7f /config-model/src/main/java/com/yahoo | |
| parent | 094c30a06a3e4441ee4dbeaa61de76fe1b6f54e4 (diff) | |
Actually set arch from flag for admin nodes
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index 16affbd7b0e..9ecd0bc4dc7 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -13,6 +13,7 @@ import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.HostSpec; import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeResources.DiskSpeed; import com.yahoo.config.provision.ProvisionLogger; import java.util.ArrayList; @@ -38,7 +39,7 @@ import java.util.stream.IntStream; */ public class InMemoryProvisioner implements HostProvisioner { - public static final NodeResources defaultHostResources = new NodeResources(1, 3, 50, 1); + public static final NodeResources defaultHostResources = new NodeResources(1, 3, 50, 1, DiskSpeed.any); private final NodeResources defaultNodeResources; @@ -234,7 +235,7 @@ public class InMemoryProvisioner implements HostProvisioner { // Minimal capacity policies private NodeResources decideResources(NodeResources resources) { if (defaultNodeResources.isUnspecified()) return resources; - return resources.withUnspecifiedNumbersFrom(defaultNodeResources); + return resources.withUnspecifiedFieldsFrom(defaultNodeResources); } private List<HostSpec> allocateHostGroup(ClusterSpec clusterGroup, NodeResources requestedResourcesOrUnspecified, |