diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-06-04 12:31:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-04 12:31:10 +0200 |
commit | 802eec5ff1466f2e599cbfeaf99f8e54d3b2f9d5 (patch) | |
tree | 65be8330ed4832d9d82b36080569b198ae960298 /node-repository | |
parent | 4646a70578b86460d416608d2ee4ed5acfdb3f74 (diff) | |
parent | fb39645dfb5ae937d65f447e6c5cf05fbf9c9b6a (diff) |
Merge pull request #13478 from vespa-engine/mpolden/want-to-deprovision-constraint
Throw on wantToDeprovision/wantToRetire mismatch
Diffstat (limited to 'node-repository')
6 files changed, 1 insertions, 189 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; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade.json deleted file mode 100644 index a1775dc794e..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "url": "http://localhost:8080/nodes/v2/node/dockerhost1.yahoo.com", - "id": "dockerhost1.yahoo.com", - "state": "active", - "type": "host", - "hostname": "dockerhost1.yahoo.com", - "openStackId": "dockerhost1", - "flavor": "large", - "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast"}, - "environment": "BARE_METAL", - "owner": { - "tenant": "zoneapp", - "application": "zoneapp", - "instance": "zoneapp" - }, - "membership": { - "clustertype": "container", - "clusterid": "node-admin", - "group": "0", - "index": 0, - "retired": false - }, - "restartGeneration": 0, - "currentRestartGeneration": 0, - "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", - "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"any" }, - "allowedToBeDown": false, - "rebootGeneration": 0, - "currentRebootGeneration": 0, - "currentOsVersion": "7.5.2", - "wantedOsVersion": "7.5.2", - "failCount": 0, - "wantToRetire": false, - "wantToDeprovision": false, - "history": [ - { - "event": "provisioned", - "at": 123, - "agent": "system" - }, - { - "event": "readied", - "at": 123, - "agent": "system" - }, - { - "event": "reserved", - "at": 123, - "agent": "application" - }, - { - "event": "activated", - "at": 123, - "agent": "application" - } - ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ] -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags1.json deleted file mode 100644 index a606777e9fd..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags1.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "flags": [ - { - "id": "exclusive-load-balancer", - "enabled": false, - "enabledHostnames": [], - "enabledApplications": ["zoneapp:zoneapp:zoneapp"] - } - ] -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags2.json deleted file mode 100644 index 4baf75f2169..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/flags2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "flags": [ - { - "id": "exclusive-load-balancer", - "enabled": false, - "enabledHostnames": [ - "host1" - ], - "enabledApplications": [ - "zoneapp:zoneapp:zoneapp", - "foo:bar:default" - ] - } - ] -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6-after-changes.json deleted file mode 100644 index 65c7e9db6cd..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6-after-changes.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "url": "http://localhost:8080/nodes/v2/node/host6.yahoo.com", - "id": "host6.yahoo.com", - "state": "active", - "type": "tenant", - "hostname": "host6.yahoo.com", - "openStackId": "node6", - "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local]", - "resources":{"vcpu":1.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local"}, - "environment": "DOCKER_CONTAINER", - "owner": { - "tenant": "tenant2", - "application": "application2", - "instance": "instance2" - }, - "membership": { - "clustertype": "content", - "clusterid": "id2", - "group": "0", - "index": 1, - "retired": false - }, - "restartGeneration": 0, - "currentRestartGeneration": 0, - "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", - "wantedVespaVersion": "6.42.0", - "allowedToBeDown": false, - "rebootGeneration": 1, - "currentRebootGeneration": 0, - "failCount": 0, - "wantToRetire": false, - "wantToDeprovision": false, - "history": [ - { - "event": "provisioned", - "at": 123, - "agent": "system" - }, - { - "event": "readied", - "at": 123, - "agent": "system" - }, - { - "event": "reserved", - "at": 123, - "agent": "application" - }, - { - "event": "activated", - "at": 123, - "agent": "application" - } - ], - "ipAddresses": [ - "127.0.6.1", - "::6:1" - ], - "additionalIpAddresses": [] -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent1.json deleted file mode 100644 index 40f4a3b5160..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent1.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "url": "http://localhost:8080/nodes/v2/node/parent1.yahoo.com", - "id": "parent1.yahoo.com", - "state": "ready", - "type": "host", - "hostname": "parent1.yahoo.com", - "openStackId": "parent1", - "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk 50.0 Gb]", - "resources":{"vcpu":2.0,"memoryGb":16.0,"diskGb":400.0,"bandwidthGbps":1.0,"diskSpeed":"fast"}, - "environment": "BARE_METAL", - "rebootGeneration": 1, - "currentRebootGeneration": 0, - "failCount": 0, - "wantToRetire": false, - "wantToDeprovision": false, - "history": [ - { - "event": "provisioned", - "at": 123, - "agent": "system" - }, - { - "event": "readied", - "at": 123, - "agent": "system" - } - ], - "ipAddresses": [ - "127.0.0.1", - "::1" - ], - "additionalIpAddresses": [] -} |