diff options
author | Torbjørn Smørgrav <smorgrav@users.noreply.github.com> | 2018-09-27 12:49:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-27 12:49:40 +0200 |
commit | 0ea9a5d2394db1cd745c90946af1ea2d1e36a857 (patch) | |
tree | 2a99435730dd3d9ff49d7b59c5e77382261a5580 | |
parent | 7adff4f783d26f7b0397ec3e5fc523e7ac10a86b (diff) | |
parent | bd90a7aa43bcdbd466ce27ebe1c05004cfa5a9ec (diff) |
Merge pull request #7122 from vespa-engine/jvenstad/give-up-when-job-no-longer-should-run
Give up when job is removed from deployment.xml
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 2bb878366c5..71b93731a44 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -101,7 +101,7 @@ public class InternalStepRunner implements StepRunner { case endTests: return endTests(id, logger); case deactivateReal: return deactivateReal(id, logger); case deactivateTester: return deactivateTester(id, logger); - case report: return report(id); + case report: return report(id, logger); default: throw new AssertionError("Unknown step '" + step + "'!"); } } @@ -398,8 +398,13 @@ public class InternalStepRunner implements StepRunner { return Optional.of(running); } - private Optional<RunStatus> report(RunId id) { - controller.jobController().active(id).ifPresent(run -> controller.applications().deploymentTrigger().notifyOfCompletion(report(run))); + private Optional<RunStatus> report(RunId id, DualLogger logger) { + try { + controller.jobController().active(id).ifPresent(run -> controller.applications().deploymentTrigger().notifyOfCompletion(report(run))); + } + catch (IllegalStateException e) { + logger.log(INFO, "Job '" + id.type() + "'no longer supposed to run?:", e); + } return Optional.of(running); } |