Merge pull request #5484 from vespa-engine/bratseth/nonfunctional-changes

Nonfunctional changes

2 files changed, 5 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
index 30b5f6f737d..149e013687f 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirer.java
@@ -34,6 +34,7 @@ import java.util.stream.Stream;
  * @author freva
  */
 public class NodeRetirer extends Maintainer {
+
     public static final FlavorSpareChecker.SpareNodesPolicy SPARE_NODES_POLICY = flavorSpareCount ->
             flavorSpareCount.getNumReadyAmongReplacees() > 2;
 
@@ -226,4 +227,5 @@ public class NodeRetirer extends Maintainer {
                         Node::flavor,
                         Collectors.groupingBy(Node::state, Collectors.counting())));
     }
+
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
index b06b5934713..7bc7d3ee732 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
@@ -87,7 +87,7 @@ public class RetiredExpirer extends Maintainer {
     /**
      * Checks if the node can be removed:
      * if the node is a docker host, it will only be removed if it has no children,
-     * or all its children are parked or failed
+     * or all its children are parked or failed.
      * Otherwise, a removal is allowed if either of these are true:
      * - The node has been in state {@link History.Event.Type#retired} for longer than {@link #retiredExpiry}
      * - Orchestrator allows it
@@ -101,8 +101,8 @@ public class RetiredExpirer extends Maintainer {
 
         Optional<Instant> timeOfRetiredEvent = node.history().event(History.Event.Type.retired).map(History.Event::at);
         Optional<Instant> retireAfter = timeOfRetiredEvent.map(retiredEvent -> retiredEvent.plus(retiredExpiry));
-        boolean shouldRetireNowBecauseExpried = retireAfter.map(time -> time.isBefore(clock.instant())).orElse(false);
-        if (shouldRetireNowBecauseExpried) {
+        boolean shouldRetireNowBecauseExpired = retireAfter.map(time -> time.isBefore(clock.instant())).orElse(false);
+        if (shouldRetireNowBecauseExpired) {
             return true;
         }