zuul
/
zuul
Code Issues Proposed changes

Merge "Remove returnNodeSet calls from scheduler"

This commit is contained in:
Zuul 2021-09-02 09:00:46 +00:00 committed by Gerrit Code Review
parent 98b5675b8a 7a62ab6da6
commit 4f90d8ec1a
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
zuul/scheduler.py
View File

@ -2020,22 +2020,10 @@ class Scheduler(threading.Thread):
# Look up the buildset to access the local node request object # Look up the buildset to access the local node request object
build_set = self._getBuildSetFromPipeline(event, pipeline) build_set = self._getBuildSetFromPipeline(event, pipeline)
if not build_set: if not build_set:
# Directly look up the node request in ZK and provide a dummy
# nodeset, so we can return the nodes to nodepool.
request = self.zk_nodepool.getNodeRequest(request_id)
if request.fulfilled:
self.nodepool.returnNodeSet(request.nodeset,
zuul_event_id=request.event_id)
return return
request = build_set.getJobNodeRequest(event.job_name) request = build_set.getJobNodeRequest(event.job_name)
if not request: if not request:
# Directly look up the node request in ZK and provide a dummy
# nodeset, so we can return the nodes to nodepool.
request = self.zk_nodepool.getNodeRequest(request_id)
if request.fulfilled:
self.nodepool.returnNodeSet(request.nodeset,
zuul_event_id=request.event_id)
return return
ready = self.nodepool.checkNodeRequest(request, request_id) ready = self.nodepool.checkNodeRequest(request, request_id)
@ -2054,9 +2042,7 @@ class Scheduler(threading.Thread):
"for node request %s", "for node request %s",
build_set.item, request.job_name, request) build_set.item, request.job_name, request)
build_set.removeJobNodeRequest(request.job_name) build_set.removeJobNodeRequest(request.job_name)
if request.fulfilled: self.nodepool.deleteNodeRequest(request)
self.nodepool.returnNodeSet(request.nodeset,
zuul_event_id=request.event_id)
return return
pipeline.manager.onNodesProvisioned(request, build_set) pipeline.manager.onNodesProvisioned(request, build_set)
@ -2160,20 +2146,13 @@ class Scheduler(threading.Thread):
# Cancel build if needed # Cancel build if needed
build = build or buildset.getBuild(job_name) build = build or buildset.getBuild(job_name)
if build: if build:
was_running = False
try: try:
was_running = self.executor.cancel(build) self.executor.cancel(build)
except Exception: except Exception:
log.exception( log.exception(
"Exception while canceling build %s for change %s", "Exception while canceling build %s for change %s",
build, item.change) build, item.change)
if (not was_running) or force:
nodeset = buildset.getJobNodeSet(job_name)
if nodeset:
self.nodepool.returnNodeSet(
nodeset, zuul_event_id=item.event)
# In the unlikely case that a build is removed and # In the unlikely case that a build is removed and
# later added back, make sure we clear out the nodeset # later added back, make sure we clear out the nodeset
# so it gets requested again. # so it gets requested again.
@ -2203,11 +2182,6 @@ class Scheduler(threading.Thread):
"Error reporting build completion to DB:") "Error reporting build completion to DB:")
else: else:
nodeset = buildset.getJobNodeSet(job_name)
if nodeset:
self.nodepool.returnNodeSet(
nodeset, zuul_event_id=item.event)
if final: if final:
# If final is set make sure that the job is not resurrected # If final is set make sure that the job is not resurrected
# later by re-requesting nodes. # later by re-requesting nodes.