diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2023-02-28 20:02:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 20:02:17 +0100 |
| commit | 42f5944056ed2b9d46b1b5538cbcccf0b369ca44 (patch) | |
| tree | ee3d41543388354aefe3907c21a262fc45f2fcbd /node-repository/src/main/java/com/yahoo | |
| parent | 6ce3c23fc9be032311b2ace1f8ade2ec48941309 (diff) | |
| parent | 8a109b406dd19c2b773938d49c7ad858e09f68df (diff) | |
Merge pull request #26237 from vespa-engine/bratseth/update-empty
Replace empty autoscaling
Diffstat (limited to 'node-repository/src/main/java/com/yahoo')
2 files changed, 5 insertions, 1 deletions
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 9506bba73e7..2cc43a1eb33 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 @@ -77,6 +77,10 @@ public class Autoscaling { return peak.equals(Load.zero()); } + public boolean isPresent() { + return ! isEmpty(); + } + @Override public boolean equals(Object o) { if ( ! (o instanceof Autoscaling other)) return false; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java index 3fdb088097c..69c03dbf6dc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java @@ -83,7 +83,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer { Autoscaling autoscaling = null; if (cluster.target().resources().isEmpty() || current.equals(cluster.target().resources().get())) { autoscaling = autoscaler.autoscale(application.get(), cluster, clusterNodes); - if ( ! autoscaling.isEmpty()) // Ignore empties we'll get from servers recently started + if ( autoscaling.isPresent() || cluster.target().isEmpty()) // Ignore empty from recently started servers cluster = cluster.withTarget(autoscaling); } |