Can allocate child to reserved parent as well

2 files changed, 3 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index 9a4e47ed154..192d90e1da1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -783,9 +783,9 @@ public class Nodes {
         if (host.allocation().map(alloc -> alloc.membership().retired()).orElse(false)) return false;
 
         if (dynamicProvisioning)
-            return EnumSet.of(Node.State.active, Node.State.ready, Node.State.provisioned).contains(host.state());
+            return EnumSet.of(State.provisioned, State.ready, State.reserved, State.active).contains(host.state());
         else
-            return host.state() == Node.State.active;
+            return host.state() == State.active;
     }
 
     public boolean suspended(Node node) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
index b92d6fb6d18..7e7c78f82f4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java
@@ -211,7 +211,7 @@ public class NodePrioritizer {
 
     /**
      * We may regret that a non-active node is allocated to a host and not offer it to the application
-     * now, e.g if we want to retire the host.
+     * now, e.g., if we want to retire the host.
      *
      * @return true if we still want to allocate the given node to its parent
      */