diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2020-01-27 11:46:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-27 11:46:18 +0100 |
commit | e2dd2231d24ac8f715e393331385932506402946 (patch) | |
tree | 3d92e2176d2f1b827f96518cb6198642ece28c24 /controller-api/src | |
parent | dea0c5da83ddf95bf70336dc825dc236ff29b787 (diff) | |
parent | 239072ab7ffa48949c06dae505b92cadfb6fccf1 (diff) |
Merge pull request #11951 from vespa-engine/jvenstad/adaptive-deployment-job-timeout
Jvenstad/adaptive deployment job timeout
Diffstat (limited to 'controller-api/src')
2 files changed, 7 insertions, 9 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java index 22c373e97ee..dd2390a1281 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java @@ -111,7 +111,7 @@ public interface NodeRepository { Optional.ofNullable(node.getCurrentFirmwareCheck()).map(Instant::ofEpochMilli), Optional.ofNullable(node.getWantedFirmwareCheck()).map(Instant::ofEpochMilli), fromBoolean(node.getAllowedToBeDown()), - Optional.ofNullable(node.suspendedSince()).map(Instant::ofEpochMilli), + Optional.ofNullable(node.suspendedSinceMillis()).map(Instant::ofEpochMilli), toInt(node.getCurrentRestartGeneration()), toInt(node.getRestartGeneration()), toInt(node.getCurrentRebootGeneration()), diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java index 2abf40be527..d554bba6b9d 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/noderepository/NodeRepositoryNode.java @@ -6,10 +6,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import java.time.Instant; import java.util.Arrays; import java.util.Map; -import java.util.Optional; import java.util.Set; @JsonIgnoreProperties(ignoreUnknown = true) @@ -82,8 +80,8 @@ public class NodeRepositoryNode { private NodeHistory[] history; @JsonProperty("allowedToBeDown") private Boolean allowedToBeDown; - @JsonProperty("suspendedSince") - private Long suspendedSince; + @JsonProperty("suspendedSinceMillis") + private Long suspendedSinceMillis; @JsonProperty("reports") private Map<String, JsonNode> reports; @JsonProperty("modelName") @@ -317,12 +315,12 @@ public class NodeRepositoryNode { return allowedToBeDown; } - public Long suspendedSince() { - return suspendedSince; + public Long suspendedSinceMillis() { + return suspendedSinceMillis; } - public void setSuspendedSince(long suspendedSinceMillis) { - this.suspendedSince = suspendedSinceMillis; + public void setSuspendedSinceMillis(long suspendedSinceMillis) { + this.suspendedSinceMillis = suspendedSinceMillis; } public String getCurrentOsVersion() { |