summaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2023-06-29 14:26:52 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2023-06-29 14:26:52 +0200
commitb92e6289c67472a23ab3f3a8b87b9ea2bff13231 (patch)
treea02c895631e14863eccc4bb81a76f036296529d6 /node-repository/src/main/java/com/yahoo
parent943849d98f9d1d72ec5b1b0fda3a01ae64cb1ada (diff)
Remove NodeSpec::isExclusive
Diffstat (limited to 'node-repository/src/main/java/com/yahoo')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java11
2 files changed, 2 insertions, 11 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index 5e48da9f291..72b71866e8c 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -433,7 +433,7 @@ class NodeAllocation {
candidate = candidate.withNode();
Allocation allocation = candidate.allocation().get();
candidate = candidate.withNode(candidate.toNode().with(allocation.with(allocation.membership()
- .with(allocation.membership().cluster().exclusive(requestedNodes.isExclusive())))));
+ .with(allocation.membership().cluster().exclusive(cluster.isExclusive())))));
nodes.put(candidate.toNode().hostname(), candidate);
}
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java
index bfe6f4211cb..f32928a9ec4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeSpec.java
@@ -24,9 +24,6 @@ public interface NodeSpec {
/** The node type this requests */
NodeType type();
- /** Returns whether the hosts running the nodes of this application can also run nodes of other applications. */
- boolean isExclusive();
-
/** Returns whether the given node resources is compatible with this spec */
boolean isCompatible(NodeResources resources);
@@ -120,9 +117,6 @@ public interface NodeSpec {
}
@Override
- public boolean isExclusive() { return exclusive; }
-
- @Override
public NodeType type() { return NodeType.tenant; }
@Override
@@ -211,7 +205,7 @@ public interface NodeSpec {
private final NodeType type;
private final CloudAccount cloudAccount;
- public TypeNodeSpec(NodeType type, CloudAccount cloudAccount) {
+ private TypeNodeSpec(NodeType type, CloudAccount cloudAccount) {
this.type = type;
this.cloudAccount = cloudAccount;
}
@@ -220,9 +214,6 @@ public interface NodeSpec {
public NodeType type() { return type; }
@Override
- public boolean isExclusive() { return false; }
-
- @Override
public boolean isCompatible(NodeResources resources) { return true; }
@Override