diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-01-08 14:50:32 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-01-08 15:28:39 +0100 |
commit | 77bd260e9070538a75891c8edd11c672b74e3311 (patch) | |
tree | d8c0850af8d2c8fce58c81fb8a10555c0ecb4e21 | |
parent | b9964ac57af1d86b9596150fe913c542792324b0 (diff) |
Rename method
3 files changed, 4 insertions, 4 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 5ff564f7ad3..66015c76b06 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 @@ -64,7 +64,7 @@ public enum SystemApplication { } /** Returns whether this should receive OS upgrades */ - public boolean isEligibleForOsUpgrades() { + public boolean shouldUpgradeOs() { return nodeType.isDockerHost(); } 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 675b40e3d9b..dcb93937eb3 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 @@ -63,7 +63,7 @@ public class OsUpgrader extends InfrastructureUpgrader { @Override protected boolean shouldUpgrade(Version target, SystemApplication application, ZoneApi zone) { - if (!application.isEligibleForOsUpgrades()) return false; // Never upgrade + if (!application.shouldUpgradeOs()) return false; // Never upgrade return controller().serviceRegistry().configServer().nodeRepository() .targetVersionsOf(zone.getId()) .osVersion(application.nodeType()) @@ -78,7 +78,7 @@ public class OsUpgrader extends InfrastructureUpgrader { /** Returns whether node in application should be upgraded by this */ public static boolean eligibleForUpgrade(Node node, SystemApplication application) { return upgradableNodeStates.contains(node.state()) && - application.isEligibleForOsUpgrades(); + application.shouldUpgradeOs(); } private static String name(CloudName cloud) { 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 d5e83d99cdd..1773a9c122e 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 @@ -65,7 +65,7 @@ public class OsVersionStatus { controller.osVersions().forEach(osVersion -> osVersions.put(osVersion, new ArrayList<>())); for (var application : SystemApplication.all()) { - if (!application.isEligibleForOsUpgrades()) continue; + if (!application.shouldUpgradeOs()) continue; for (var zone : zonesToUpgrade(controller)) { var targetOsVersion = controller.serviceRegistry().configServer().nodeRepository() .targetVersionsOf(zone.getId()) |