zuul/zuul
Code Issues Proposed changes

Handle exceptions when forcibly canceling builds

Browse Source 
When builds are forcibly canceled due to pipeline deletions, there
are some race conditions that can result in exceptions in the executor.
Handle these conditions explicitly to avoid unecessary tracebacks
in the logs.

Change-Id: I2c85cbcd8b50b746b338418d8fa93ea5c7c58876
This commit is contained in:
James E. Blair 2024-08-06 07:19:31 -07:00
parent dbd1db370c
commit 45d9f251b1
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zuul/executor/server.py
View File

@ -4024,7 +4024,11 @@ class ExecutorServer(BaseMergeServer):
# to aid the test suite in avoiding races.
if build_event == JobRequestEvent.CANCELED:
self.stopJob(build_request)
self.executor_api.fulfillCancel(build_request)
try:
self.executor_api.fulfillCancel(build_request)
except NoNodeError:
self.log.warning("Unable to fulfill cancel request, "
"build request may have been removed")
elif build_event == JobRequestEvent.RESUMED:
self.resumeJob(build_request)
self.executor_api.fulfillResume(build_request)
@ -4460,8 +4464,11 @@ class ExecutorServer(BaseMergeServer):
# should still update the build request just in case, in
# order to prevent another executor from starting an
# unecessary build.
self._retry(build_request.lock, self.executor_api.update,
build_request)
try:
self._retry(build_request.lock, self.executor_api.update,
build_request)
except JobRequestNotFound as e:
self.log.warning("Build was removed: %s", str(e))
self._retry(build_request.lock, self.executor_api.unlock,
build_request)