diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-03-18 14:01:24 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-03-18 14:02:40 +0100 |
| commit | 243310a6a9403d833c9792c9b464331f68836374 (patch) | |
| tree | 599000035dc20394059d39d7b48118044a60061b /controller-server | |
| parent | 7d79a8962a547e74263f4b6be99776acb872de6a (diff) | |
Fix method name
Diffstat (limited to 'controller-server')
3 files changed, 5 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java index c994f0ae4fd..1a1b6988a96 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java @@ -65,8 +65,8 @@ public enum SystemApplication { .orElse(false); } - /** Returns whether this should receive OS upgrades in given zone */ - public boolean shouldUpgradeOsIn() { + /** Returns whether this should receive OS upgrades */ + public boolean shouldUpgradeOs() { return nodeType.isHost(); } 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 a20043d35c0..43e9ce51040 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 @@ -62,7 +62,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> { @Override protected boolean expectUpgradeOf(Node node, SystemApplication application, ZoneApi zone) { return cloud.equals(zone.getCloudName()) && // Cloud is managed by this upgrader - application.shouldUpgradeOsIn() && // Application should upgrade in this cloud + application.shouldUpgradeOs() && // Application should upgrade in this cloud canUpgrade(node); // Node is in an upgradable state } @@ -76,7 +76,7 @@ public class OsUpgrader extends InfrastructureUpgrader<OsVersionTarget> { @Override protected boolean changeTargetTo(OsVersionTarget target, SystemApplication application, ZoneApi zone) { - if (!application.shouldUpgradeOsIn()) return false; + if (!application.shouldUpgradeOs()) return false; return controller().serviceRegistry().configServer().nodeRepository() .targetVersionsOf(zone.getId()) .osVersion(application.nodeType()) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java index ac9f32a2ae6..226852f1f3d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java @@ -63,7 +63,7 @@ public class OsVersionStatus { for (var application : SystemApplication.all()) { for (var zone : zonesToUpgrade(controller)) { - if (!application.shouldUpgradeOsIn()) continue; + if (!application.shouldUpgradeOs()) continue; var targetOsVersion = controller.serviceRegistry().configServer().nodeRepository() .targetVersionsOf(zone.getId()) .osVersion(application.nodeType()) |