Deny setting unallocated node active

2 files changed, 10 insertions, 1 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 26fadbf7e91..fb1f9edad31 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
@@ -352,8 +352,12 @@ public class NodeRepository extends AbstractComponent {
 
     public Node move(String hostname, Node.State toState) {
         Optional<Node> node = getNode(hostname);
-        if ( ! node.isPresent())
+        if ( ! node.isPresent()) {
             throw new NotFoundException("Could not move " + hostname + " to " + toState + ": Node not found");
+        }
+        if (toState == Node.State.active && !node.get().allocation().isPresent()) {
+            throw new IllegalArgumentException("Could not set " + hostname + " active. It has no allocation.");
+        }
         try (Mutex lock = lock(node.get())) {
             return zkClient.writeTo(toState, node.get());
         }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
index e1ab2914cff..ec63b0842dd 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java
@@ -347,6 +347,11 @@ public class RestApiTest {
         assertResponse(new Request("http://localhost:8080/nodes/v2/node/host4.yahoo.com",
                                    Utf8.toBytes("{\"flavor\": 1}"), Request.Method.PATCH),
                        400, "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set field 'flavor': Expected a STRING value, got a LONG\"}");
+
+        // Attempt to set unallocated node active
+        assertResponse(new Request("http://localhost:8080/nodes/v2/state/active/host2.yahoo.com",
+                                   new byte[0], Request.Method.PUT), 400,
+                       "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not set host2.yahoo.com active. It has no allocation.\"}");
     }