From bd90a7aa43bcdbd466ce27ebe1c05004cfa5a9ec Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Thu, 27 Sep 2018 12:44:59 +0200 Subject: Give up when job is removed from deployment.xml --- .../hosted/controller/deployment/InternalStepRunner.java | 11 ++++++++--- 1 file 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 report(RunId id) { - controller.jobController().active(id).ifPresent(run -> controller.applications().deploymentTrigger().notifyOfCompletion(report(run))); + private Optional 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); } -- cgit v1.2.3