summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-12-03 09:32:17 +0100
committerJon Marius Venstad <venstad@gmail.com>2019-12-03 09:32:17 +0100
commit13ed1b364f99dbb94c2544af1b77f4f715fbfbb5 (patch)
tree215f46b83e81149085ead27253d55240033486d4 /controller-server
parent92fccadd7a894e5ddd84121d80f40170b12799e9 (diff)
Handle removal of job types
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 73fa19c7d8b..dffc1dfe88e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -487,10 +487,10 @@ public class ApplicationSerializer {
private Map<JobType, Instant> jobPausesFromSlime(Inspector object) {
Map<JobType, Instant> jobPauses = new HashMap<>();
- object.field(jobStatusField).traverse((ArrayTraverser) (__, jobPauseObject) -> {
- jobPauses.put(JobType.fromJobName(jobPauseObject.field(jobTypeField).asString()),
- Instant.ofEpochMilli(jobPauseObject.field(pausedUntilField).asLong()));
- });
+ object.field(jobStatusField).traverse((ArrayTraverser) (__, jobPauseObject) ->
+ JobType.fromOptionalJobName(jobPauseObject.field(jobTypeField).asString())
+ .ifPresent(jobType -> jobPauses.put(jobType,
+ Instant.ofEpochMilli(jobPauseObject.field(pausedUntilField).asLong()))));
return jobPauses;
}