Merge "Fix build leak with paused jobs"

1 files changed, 10 insertions, 0 deletions

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index a5682953c..af6096b7e 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -1200,10 +1200,20 @@ class Scheduler(threading.Thread):
         log = get_annotated_logger(self.log, build.zuul_event_id)
         if build.build_set is not build.build_set.item.current_build_set:
             log.warning("Build %s is not in the current build set", build)
+            try:
+                self.executor.cancel(build)
+            except Exception:
+                log.exception(
+                    "Exception while canceling paused build %s", build)
             return
         pipeline = build.build_set.item.pipeline
         if not pipeline:
             log.warning("Build %s is not associated with a pipeline", build)
+            try:
+                self.executor.cancel(build)
+            except Exception:
+                log.exception(
+                    "Exception while canceling paused build %s", build)
             return
         pipeline.manager.onBuildPaused(event.build)