diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-27 12:44:59 +0200 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-09-27 12:44:59 +0200 |
commit | bd90a7aa43bcdbd466ce27ebe1c05004cfa5a9ec (patch) | |
tree | 1a464cce1070d06bb8575807fb3549d22359fedc | |
parent | b20c3bb6ef5a722ba879353eed2cc0d8da93ae9a (diff) |
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); } |