diff options
| author | Håkon Hallingstad <hakon@yahooinc.com> | 2023-10-17 13:05:02 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@yahooinc.com> | 2023-10-17 13:05:02 +0200 |
| commit | 200c93d92fd29c68efba1129eba925f3decbd3c3 (patch) | |
| tree | d58ad6a98b4f0caa100078f6711695c93458c765 /node-repository | |
| parent | dcbef25fe2c582224070d966ea292ef778c2522b (diff) | |
Align ClusterSpec::exclusive with CapacityPolicies::decideExclusivity and HostSharing.provision
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 2 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 b4fa3d549f8..f9ac7367778 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 @@ -174,7 +174,7 @@ public class CapacityPolicies { public ClusterSpec decideExclusivity(Capacity capacity, ClusterSpec requestedCluster) { if (capacity.cloudAccount().isPresent()) return requestedCluster.withExclusivity(true); // Implicit exclusive boolean exclusive = requestedCluster.isExclusive() && (capacity.isRequired() || zone.environment() == Environment.prod); - return requestedCluster.withExclusivity(exclusive).withProvisionForApplication(exclusive); + return requestedCluster.withExclusivity(exclusive); } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java index bd84ec9b05a..89ff0938d59 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java @@ -208,7 +208,7 @@ public class Preparer { private HostSharing hostSharing(ClusterSpec cluster, NodeType hostType) { if ( hostType.isSharable()) - return cluster.provisionForApplication() ? HostSharing.provision : + return cluster.isExclusive() ? HostSharing.provision : nodeRepository.exclusiveAllocation(cluster) ? HostSharing.exclusive : HostSharing.any; else |