summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2020-01-08 14:50:32 +0100
committerMartin Polden <mpolden@mpolden.no>2020-01-13 12:06:54 +0100
commit7dccc1f6412808b4c10adbe8d109724c3899ff24 (patch)
tree55ae64a0944607959064816c39562fecb7a60d96
parent2f9df76c0abd447f2b716e577ea2956c6bfafbd7 (diff)
Rename method
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/SystemApplication.java2
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgrader.java4
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/OsVersionStatus.java2
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())