aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2023-02-20 13:36:32 +0100
committerJon Bratseth <bratseth@gmail.com>2023-02-20 13:36:32 +0100
commiteafde7e64b320367ee952cd06cc8ca9dc127d144 (patch)
treee10d9d135711816d47b86537c6075a6b95a973a5
parenta5d5a7dd7bab499554691fa59e08b3771b5e32d3 (diff)
Wipe less
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Cluster.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaling.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Cluster.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Cluster.java
index ea4944c2bd5..ea35f1e85ff 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Cluster.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/applications/Cluster.java
@@ -57,7 +57,7 @@ public class Cluster {
this.suggested = Objects.requireNonNull(suggested);
Objects.requireNonNull(target);
if (target.resources().isPresent() && ! target.resources().get().isWithin(minResources, maxResources))
- this.target = Autoscaling.empty();
+ this.target = target.withResources(Optional.empty()); // Delete illegal target
else
this.target = target;
this.bcpGroupInfo = Objects.requireNonNull(bcpGroupInfo);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaling.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaling.java
index a68a667ffe6..3825309e97b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaling.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaling.java
@@ -57,6 +57,10 @@ public class Autoscaling {
return new Autoscaling(status, description, resources, at, peak, ideal, metrics);
}
+ public Autoscaling withResources(Optional<ClusterResources> resources) {
+ return new Autoscaling(status, description, resources, at, peak, ideal, metrics);
+ }
+
/** Converts this autoscaling into an ideal one at the completion of it. */
public Autoscaling asIdeal(Instant at) {
return new Autoscaling(Status.ideal,