diff options
| author | Kristian Aune <kkraune@users.noreply.github.com> | 2018-01-29 08:48:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 08:48:10 +0100 |
| commit | 319d2d00a14ad367ae2e7d3e891e3f33afcf21b5 (patch) | |
| tree | 5c20f2e9f2665f069c6b19927683b232eed693ca | |
| parent | 7faa87a64a1867bcc239d6ce4442fa3da7655eac (diff) | |
| parent | 5ce572d580765b133003be98649135166b708c01 (diff) | |
Merge pull request #4713 from vespa-engine/freva/remove-divergent-check
Revert "don't allow nodes with spec divergence to go to dirty"
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/NodeRepository.java | 5 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java | 2 |
2 files changed, 3 insertions, 4 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 19894050ff4..c26e59a0b1a 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 @@ -391,9 +391,8 @@ public class NodeRepository extends AbstractComponent { Node nodeToDirty = getNode(hostname, Node.State.provisioned, Node.State.failed, Node.State.parked).orElseThrow(() -> new IllegalArgumentException("Could not deallocate " + hostname + ": No such node in the provisioned, failed or parked state")); - if (nodeToDirty.status().hardwareFailureDescription().isPresent() || nodeToDirty.status().hardwareDivergence().isPresent()) - throw new IllegalArgumentException("Could not deallocate " + hostname + ": It has a hardware failure/spec divergence"); - + if (nodeToDirty.status().hardwareFailureDescription().isPresent()) + throw new IllegalArgumentException("Could not deallocate " + hostname + ": It has a hardware failure"); return setDirty(nodeToDirty); } 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 c23a7f9990a..bdea767eb0d 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 @@ -282,7 +282,7 @@ public class RestApiTest { "{\"message\":\"Moved host12.yahoo.com to failed\"}"); assertResponse(new Request("http://localhost:8080/nodes/v2/state/dirty/host12.yahoo.com", new byte[0], Request.Method.PUT), 400, - "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not deallocate host12.yahoo.com: It has a hardware failure/spec divergence\"}"); + "{\"error-code\":\"BAD_REQUEST\",\"message\":\"Could not deallocate host12.yahoo.com: It has a hardware failure\"}"); } @Test |