summaryrefslogtreecommitdiffstats
path: root/controller-server/src
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2017-10-23 12:21:30 +0200
committerGitHub <noreply@github.com>2017-10-23 12:21:30 +0200
commit7f93a3bd50c534c92d3d7b37a4a5a47e512ff0d7 (patch)
treed49070c2fa1359ac07de8d35ca0e5c378795a5f9 /controller-server/src
parenta7bdda9b3787e01d63aa58c6e87ea48101b4d098 (diff)
parent684e9d7de0f6d939bdbc8f4d6771390f0c1443cb (diff)
Merge pull request #3841 from vespa-engine/bratseth/handle-missing-jobstatus
Handle missing job status
Diffstat (limited to 'controller-server/src')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
index 76251d47703..3f5877addb7 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java
@@ -132,6 +132,7 @@ public class DeploymentTrigger {
if ( ! application.deploying().isPresent()) return;
for (JobType jobType : order.jobsFrom(application.deploymentSpec())) {
JobStatus jobStatus = application.deploymentJobs().jobStatus().get(jobType);
+ if (jobStatus == null) continue; // never run
if (jobStatus.isRunning(jobTimeoutLimit())) continue;
// Collect the subset of next jobs which have not run with the last changes