diff options
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java | 4 | ||||
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsUpgrader.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java index 5d8296d6f9d..bd7f39b1f6e 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/DelegatingOsUpgrader.java @@ -38,7 +38,7 @@ public class DelegatingOsUpgrader extends OsUpgrader { .matching(node -> canUpgradeTo(target.version(), now, node)) .byIncreasingOsVersion() .first(upgradeSlots(target, activeNodes)); - if (nodesToUpgrade.size() == 0) return; + if (nodesToUpgrade.isEmpty()) return; LOG.info("Upgrading " + nodesToUpgrade.size() + " nodes of type " + target.nodeType() + " to OS version " + target.version().toFullString()); nodeRepository.nodes().upgradeOs(NodeListFilter.from(nodesToUpgrade.asList()), Optional.of(target.version())); @@ -49,7 +49,7 @@ public class DelegatingOsUpgrader extends OsUpgrader { NodeList nodesUpgrading = nodeRepository.nodes().list() .nodeType(type) .changingOsVersion(); - if (nodesUpgrading.size() == 0) return; + if (nodesUpgrading.isEmpty()) return; LOG.info("Disabling OS upgrade of all " + type + " nodes"); nodeRepository.nodes().upgradeOs(NodeListFilter.from(nodesUpgrading.asList()), Optional.empty()); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsUpgrader.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsUpgrader.java index f56e75518a3..2f09a0a5a29 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsUpgrader.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/os/OsUpgrader.java @@ -44,7 +44,7 @@ public abstract class OsUpgrader { /** Returns the number of upgrade slots available for given target */ final int upgradeSlots(OsVersionTarget target, NodeList candidates) { if (!candidates.stream().allMatch(node -> node.type() == target.nodeType())) { - throw new IllegalArgumentException("All node types must type of OS version target " + target.nodeType()); + throw new IllegalArgumentException("All node types must match type of OS version target " + target.nodeType()); } int max = target.nodeType() == NodeType.host ? maxActiveUpgrades.value() : 1; int upgrading = candidates.changingOsVersionTo(target.version()).size(); |