diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-10-23 15:01:52 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-10-23 15:01:52 +0200 |
| commit | 66fe3e58722d80ed7b8c4573f5b635160bae897a (patch) | |
| tree | 350e678a64f93fcb6ca126dfb5e22bc04f2d3ee6 /controller-server | |
| parent | 2c2a533067954a7312f99211f6afa4c920506b75 (diff) | |
Really do n number of upgrades per minute
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java index 73b135aa912..5a67705383d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java @@ -116,7 +116,11 @@ public class Upgrader extends Maintainer { /** Returns the number of applications to upgrade in this run */ private int numberOfApplicationsToUpgrade() { - return Math.max(1, (int) (maintenanceInterval().getSeconds() * (upgradesPerMinute() / 60))); + long intervalMillis = maintenanceInterval().dividedBy(Math.max(1, controller().curator().cluster().size())).toMillis(); + long intervalStart = ((controller().clock().millis() + intervalMillis / 2) / intervalMillis) * intervalMillis; + + long upgradeIntervalMillis = upgradesPerMinute() > 60e3 ? 1 : upgradesPerMinute() < 60e-3 ? 1_000_000 : (long) (60_000 / upgradesPerMinute()); + return (int) ((intervalStart + intervalMillis) / upgradeIntervalMillis - intervalStart / intervalMillis); } /** Returns number of upgrades per minute */ |