diff options
| author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-01-11 13:35:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 13:35:32 +0100 |
| commit | c77d54ba02163c07d1f4eb08ab1dc766720f7c1f (patch) | |
| tree | 1bc525bbbf8000198ba4465d7afdc4610cc6ca3b | |
| parent | b885dc655d245570c8f2ea07a4ff67da32c52520 (diff) | |
| parent | 547cfdb22ede6b64fc30c383eeef6670a241d4e2 (diff) | |
Merge pull request #20752 from vespa-engine/bratseth/ignore-collisions-harder
Don't report 0 success on collisions if we ignore them
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java | 3 | ||||
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java index 80c192f8353..abacaf8e264 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java @@ -72,7 +72,8 @@ public class Autoscaler { if (scaledIn(clusterModel.scalingDuration(), cluster)) return Advice.dontScale(Status.waiting, - "Won't autoscale now: Less than " + clusterModel.scalingDuration() + " since last resource change"); + "Won't autoscale now: Less than " + clusterModel.scalingDuration() + + " since last resource change"); if (clusterModel.nodeTimeseries().measurementsPerNode() < minimumMeasurementsPerNode(clusterModel.scalingDuration())) return Advice.none(Status.waiting, diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java index 9f27ac507c9..da22dbdc336 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java @@ -113,7 +113,9 @@ public abstract class Maintainer implements Runnable { successFactor = maintain(); } catch (UncheckedTimeoutException e) { - if ( ! ignoreCollision) + if (ignoreCollision) + successFactor = 1; + else log.log(Level.WARNING, this + " collided with another run. Will retry in " + interval); } catch (Throwable e) { |