diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-07-06 15:25:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 15:25:29 +0200 |
| commit | 07ee107a685041dd20de5a1733d67fc53266b17c (patch) | |
| tree | 2dd02dcac589365933f67a063a9a47bcf038cda0 /controller-server/src/main/java/com/yahoo | |
| parent | a8fd603037e8d0dfc72df0d6e0f2da068803256c (diff) | |
| parent | fb6ac304d15727021f229b523410b6cd099ee915 (diff) | |
Merge pull request #23389 from vespa-engine/mpolden/fair-budget
Divide OS upgrade budget evenly across all zones
Diffstat (limited to 'controller-server/src/main/java/com/yahoo')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java index fa64a2677f4..0c146179f34 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java @@ -98,9 +98,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> { /** Returns whether to spend upgrade budget on given zone */ private boolean spendBudgetOn(ZoneApi zone) { - if (!zone.getEnvironment().isProduction()) return false; - if (controller().zoneRegistry().systemZone().getVirtualId().equals(zone.getVirtualId())) return false; // Controller zone - return true; + return !controller().zoneRegistry().systemZone().getVirtualId().equals(zone.getVirtualId()); // Do not spend budget on controller zone } /** Returns whether node is in a state where it can be upgraded */ |