zuul
/
nodepool
Code Issues Proposed changes

Merge "Respect timeout when not accepting requests"

This commit is contained in:
Zuul 2023-03-15 14:58:27 +00:00 committed by Gerrit Code Review
parent d9af3f00ec 3209226fc1
commit c006b47686
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodepool/launcher.py
View File

@ -148,6 +148,14 @@ class PoolWorker(threading.Thread, stats.StatsReporter):
if not self.running:
return True
# if we exceeded the timeout stop iterating here
elapsed = time.monotonic() - start
if elapsed > timeout:
self.log.debug("Early exit from handler assignment on timeout "
"after %s/%s requests in %s",
req_count + 1, len(requests), elapsed)
return False
req = self.zk.getNodeRequest(req.id)
if not req:
continue
@ -279,13 +287,6 @@ class PoolWorker(threading.Thread, stats.StatsReporter):
self.paused_handlers.add(rh)
self.request_handlers.append(rh)
# if we exceeded the timeout stop iterating here
elapsed = time.monotonic() - start
if elapsed > timeout:
self.log.debug("Early exit from handler assignment on timeout "
"after %s/%s requests in %s",
req_count + 1, len(requests), elapsed)
return False
elapsed = time.monotonic() - start
self.log.debug("Finished handler assignment %s requests in %s",
len(requests), elapsed)