summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@oath.com>2019-11-25 10:51:45 +0100
committerMorten Tokle <mortent@oath.com>2019-11-25 13:32:55 +0100
commitc812ad296ec867d41e857ac74a70c9520c9dac0f (patch)
tree0b158fdcbacf6a807ece063e8420b263ba390336
parent9ebeb1c8a557a7094e1708b45d649efe56421dcd (diff)
Simplify
-rw-r--r--config-provisioning/abi-spec.json2
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java4
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java2
4 files changed, 5 insertions, 5 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index a2f914ca6f7..3cff2bb4da1 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -674,7 +674,7 @@
"public java.lang.String description()",
"public com.yahoo.config.provision.NodeType childNodeType()",
"public java.util.List childNodeTypes()",
- "public boolean supportsChild(com.yahoo.config.provision.NodeType)"
+ "public boolean canRun(com.yahoo.config.provision.NodeType)"
],
"fields": [
"public static final enum com.yahoo.config.provision.NodeType tenant",
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
index 93f2602cacc..58ae8b95e97 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeType.java
@@ -75,7 +75,7 @@ public enum NodeType {
* @param type Child {@link NodeType}
* @return true if the {@link NodeType} can run on this host, false otherwise.
*/
- public boolean supportsChild(NodeType type) {
- return isDockerHost() && childNodeTypes.contains(type);
+ public boolean canRun(NodeType type) {
+ return childNodeTypes.contains(type);
}
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
index f46cde995d7..a609103ac89 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
@@ -71,7 +71,7 @@ public class DockerHostCapacity {
NodeResources freeCapacityOf(Node host, boolean excludeInactive) {
// Only hosts have free capacity
- if (!host.type().supportsChild(NodeType.tenant)) return new NodeResources(0, 0, 0, 0);
+ if (!host.type().canRun(NodeType.tenant)) return new NodeResources(0, 0, 0, 0);
NodeResources hostResources = hostResourcesCalculator.availableCapacityOf(host.flavor().resources());
return allNodes.childrenOf(host).asList().stream()
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
index a0d81385cad..2316c5cf4de 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
@@ -138,7 +138,7 @@ public class NodePrioritizer {
NodeResources wantedResources = resources(requestedNodes);
for (Node host : candidates) {
- if (!host.type().supportsChild(requestedNodes.type())) continue;
+ if (!host.type().canRun(requestedNodes.type())) continue;
if (host.status().wantToRetire()) continue;
boolean hostHasCapacityForWantedFlavor = capacity.hasCapacity(host, wantedResources);