diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-06-03 15:49:06 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-06-03 16:46:28 +0200 |
commit | fb39645dfb5ae937d65f447e6c5cf05fbf9c9b6a (patch) | |
tree | 990367f3b0640af54113a94e8190faf5056e8c77 /node-repository | |
parent | 6e17a0d73d6b47eeb38afa1a81834dcfc084c6f1 (diff) |
Throw on wantToDeprovision/wantToRetire mismatch
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java index c289edfc19e..3e5ef81e614 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Status.java @@ -37,9 +37,7 @@ public class Status { this.dockerImage = Objects.requireNonNull(dockerImage, "Docker image must be non-null").filter(d -> !DockerImage.EMPTY.equals(d)); this.failCount = failCount; if (wantToDeprovision && !wantToRetire) { - // TODO(mpolden): Throw when persisted nodes have been rewritten - wantToRetire = true; - //throw new IllegalArgumentException("Node cannot be marked wantToDeprovision unless it's also marked wantToRetire"); + throw new IllegalArgumentException("Node cannot be marked wantToDeprovision unless it's also marked wantToRetire"); } this.wantToRetire = wantToRetire; this.wantToDeprovision = wantToDeprovision; |