zuul/nodepool
Code Issues Proposed changes

Merge "Don't join image upload workers on stop()" into feature/zuulv3

Browse Source
This commit is contained in:
Jenkins 2017-06-27 17:30:51 +00:00 committed by Gerrit Code Review
commit ccc488ab54
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nodepool/builder.py
View File

@ -1127,7 +1127,14 @@ class NodePoolBuilder(object):
'''
with self._start_lock:
self.log.debug("Stopping. NodePoolBuilder shutting down workers")
workers = self._build_workers + self._upload_workers
# Note we do not add the upload workers to this list intentionally.
# The reason for this is that uploads can take many hours and there
# is no good way to stop the blocking writes performed by the
# uploads in order to join() below on a reasonable amount of time.
# Killing the process will stop the upload then both the record
# in zk and in the cloud will be deleted by any other running
# builders or when this builder starts again.
workers = self._build_workers
if self._janitor:
workers += [self._janitor]
for worker in (workers):