zuul
/
zuul
Code Issues Proposed changes

Merge "Allow clean scheduler shutdown when priming fails"

This commit is contained in:
Zuul 2022-12-01 19:59:42 +00:00 committed by Gerrit Code Review
parent 491b32865e 71598ee51b
commit d3b0e614e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zuul/scheduler.py
View File

@ -369,6 +369,9 @@ class Scheduler(threading.Thread):
self.log.debug("Stopping scheduler")
self._stopped = True
self.wake_event.set()
# Main thread, connections and layout update may be waiting
# on the primed event
self.primed_event.set()
self.start_cleanup_thread.join()
self.log.debug("Stopping apscheduler")
self.apsched.shutdown()
@ -382,8 +385,6 @@ class Scheduler(threading.Thread):
self.log.debug("Stopping nodepool")
self.nodepool.stop()
self.log.debug("Stopping connections")
# Connections and layout update may be waiting on the primed event
self.primed_event.set()
# Layout update can reconfigure connections, so make sure
# layout update is stopped first.
self.log.debug("Waiting for layout update thread")