Rename deallocate -> setDirty

5 files changed, 9 insertions, 11 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
index 76218af9a80..81b109456b8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java
@@ -299,24 +299,22 @@ public class NodeRepository extends AbstractComponent {
         return zkClient.writeTo(Node.State.inactive, nodes, transaction);
     }
 
-    /** Deallocates these nodes, causing them to move to the dirty state */
-    public List<Node> deallocate(List<Node> nodes) {
+    /** Move nodes to the dirty state */
+    public List<Node> setDirty(List<Node> nodes) {
         return performOn(NodeListFilter.from(nodes), node -> zkClient.writeTo(Node.State.dirty, node));
     }
 
     /** 
-     * Deallocate a node which is in the failed or parked state. 
-     * Use this to recycle failed nodes which have been repaired or put on hold.
+     * Set a node dirty, which is in the failed or parked state.
      *
      * @throws IllegalArgumentException if the node has hardware failure
      */
-    public Node deallocate(String hostname) {
-        Optional<Node> nodeToDeallocate = getNode(hostname, Node.State.failed, Node.State.parked);
+    public Node setDirty(String hostname) {
         if ( ! nodeToDeallocate.isPresent())
             throw new IllegalArgumentException("Could not deallocate " + hostname + ": No such node in the failed or parked state");
         if (nodeToDeallocate.get().status().hardwareFailure().isPresent())
             throw new IllegalArgumentException("Could not deallocate " + hostname + ": It has a hardware failure");
-        return deallocate(Collections.singletonList(nodeToDeallocate.get())).get(0);
+        return setDirty(Collections.singletonList(nodeToDeallocate.get())).get(0);
     }
 
     /**
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
index 8db67a4af67..2a7121b3e7a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/FailedExpirer.java
@@ -52,7 +52,7 @@ public class FailedExpirer extends Expirer {
             if (failCountIndicatesHwFail(zone) && recycleCandidate.status().failCount() >= 5) continue;
             nodesToRecycle.add(recycleCandidate);
         }
-        nodeRepository.deallocate(nodesToRecycle);
+        nodeRepository.setDirty(nodesToRecycle);
     }
 
     private boolean failCountIndicatesHwFail(Zone zone) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
index 652a3783d4b..1e37020f846 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveExpirer.java
@@ -33,7 +33,7 @@ public class InactiveExpirer extends Expirer {
 
     @Override
     protected void expire(List<Node> expired) {
-        nodeRepository.deallocate(expired);
+        nodeRepository.setDirty(expired);
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
index f45f8ebd086..6745c24e237 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ReservationExpirer.java
@@ -28,6 +28,6 @@ public class ReservationExpirer extends Expirer {
     }
 
     @Override
-    protected void expire(List<Node> expired) { nodeRepository.deallocate(expired); }
+    protected void expire(List<Node> expired) { nodeRepository.setDirty(expired); }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
index 7e329e1599b..369bdcaadff 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesApiHandler.java
@@ -106,7 +106,7 @@ public class NodesApiHandler extends LoggingRequestHandler {
             return new MessageResponse("Moved " + lastElement(path) + " to parked");
         }
         else if (path.startsWith("/nodes/v2/state/dirty/")) {
-            nodeRepository.deallocate(lastElement(path));
+            nodeRepository.setDirty(lastElement(path));
             return new MessageResponse("Moved " + lastElement(path) + " to dirty");
         }
         else if (path.startsWith("/nodes/v2/state/active/")) {