diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-01-06 15:08:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-06 15:08:06 +0100 |
commit | 55fb144ec32fdcdcf42535fcf27d404aece9594b (patch) | |
tree | 0def16d917bb25ba0562129144dd822964a97fc4 /node-repository | |
parent | 1f2e4cf0fc0473c1c401fe755b3e9b862d3468b7 (diff) | |
parent | cb562d27c8cbe70ce743a3ed401eea7dbae298ba (diff) |
Merge pull request #25431 from vespa-engine/bratseth/exclusive-containers-in-public
Exclusive containers in public
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 1 | ||||
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java index ae1ea6c4d71..ea22c768e90 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java @@ -205,6 +205,7 @@ public class NodeRepository extends AbstractComponent { */ public boolean exclusiveAllocation(ClusterSpec clusterSpec) { return clusterSpec.isExclusive() || + ( clusterSpec.type().isContainer() && zone.system().isPublic() && !zone.environment().isTest() ) || ( !zone().cloud().allowHostSharing() && !sharedHosts.value().isEnabled(clusterSpec.type().name())); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index d48a3d169a2..e1b32726070 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -215,13 +215,13 @@ public class AutoscalingTest { fixture.loader().applyCpuLoad(0.25f, 120); ClusterResources scaledResources = fixture.tester().assertResources("Scaling cpu up", - 3, 1, 5, 13.3, 66.1, + 4, 1, 4, 16.0, 40.8, fixture.autoscale()); fixture.deploy(Capacity.from(scaledResources)); fixture.deactivateRetired(Capacity.from(scaledResources)); fixture.loader().applyCpuLoad(0.1f, 120); fixture.tester().assertResources("Scaling down since cpu usage has gone down", - 3, 1, 2.5, 9.2, 61.1, + 3, 1, 4, 16, 30.6, fixture.autoscale()); } @@ -733,7 +733,7 @@ public class AutoscalingTest { fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1), 100); fixture.tester().assertResources("With non-exclusive nodes, a better solution is " + "50% more nodes with half the cpu", - 3, 1, 1, 4, 100.0, + 3, 1, 1.1, 4, 100.0, fixture.autoscale()); fixture.tester().deploy(fixture.applicationId(), clusterSpec(true), fixture.capacity()); @@ -766,7 +766,7 @@ public class AutoscalingTest { } private ClusterSpec clusterSpec(boolean exclusive) { - return ClusterSpec.request(ClusterSpec.Type.container, + return ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test")).vespaVersion("8.1.2") .exclusive(exclusive) .build(); |