diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-01 19:59:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-01 19:59:42 +0000 |
| commit | d3b0e614e0643b398037db2047096333e58a2ff6 (patch) | |
| tree | 4ad4638619cd75806124543bfb254a005bf98109 | |
| parent | 491b32865ef78ef49703c8c78c2ca960d2e33b8a (diff) | |
| parent | 71598ee51bb451e4fa324165618bcb0c41f80700 (diff) | |
| download | zuul-d3b0e614e0643b398037db2047096333e58a2ff6.tar.gz | |
Merge "Allow clean scheduler shutdown when priming fails"
| -rw-r--r-- | zuul/scheduler.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/zuul/scheduler.py b/zuul/scheduler.py index 42f8afbb0..83d74fb43 100644 --- a/zuul/scheduler.py +++ b/zuul/scheduler.py @@ -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") |