diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-08-18 16:15:38 +0200 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-08-18 16:15:38 +0200 |
| commit | cfa162005b86bb02505e21d686dc08c2988a430f (patch) | |
| tree | a22dfce6b38557ab4810d690c8d554a395033423 /config-model/src/main/java/com/yahoo/config/model/provision | |
| parent | 0f29711bbdcba9413cd00e84561c468c07620276 (diff) | |
Add back optionalNodeResourcesFromSlime
We don't serialize requested resources (Noderesources) when they are empty
(as they are when they are created with unspecified()), so
cannot remove optionalNodeResourcesFromSlime before that is done in
some other way
Diffstat (limited to 'config-model/src/main/java/com/yahoo/config/model/provision')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 2 |
1 files changed, 1 insertions, 1 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 62b9cefab78..4c6dccebae4 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 @@ -197,7 +197,7 @@ public class InMemoryProvisioner implements HostProvisioner { int nextIndex = nextIndexInCluster.getOrDefault(new Pair<>(clusterGroup.type(), clusterGroup.id()), startIndex); while (allocation.size() < nodesInGroup) { - // Find the smallest host that can fit the requested requested + // Find the smallest host that can fit the requested resources Optional<NodeResources> hostResources = freeNodes.keySet().stream() .sorted(new MemoryDiskCpu()) .filter(resources -> requestedResources.isUnspecified() || resources.satisfies(requestedResources)) |