zuul/zuul
Code Issues Proposed changes

Merge "Avoid leaked items caused by config errors"

Browse Source
This commit is contained in:
Zuul
2023-09-15 18:41:33 +00:00
committed by Gerrit Code Review
parent fa91b0977d 7ba9307f11
commit 4b347ce91b
3 changed files with 252 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
zuul/manager/__init__.py
View File

@@ -672,16 +672,20 @@ class PipelineManager(metaclass=ABCMeta):
# to report a message to the user.
actions = self.pipeline.failure_actions
ci = change_queue.enqueueChange(change, event)
for w in warnings:
ci.warning(w)
ci.setReportedResult('FAILURE')
try:
for w in warnings:
ci.warning(w)
ci.setReportedResult('FAILURE')
# Only report the item if the project is in the current
# pipeline. Otherwise the change could be spammed by
# reports from unrelated pipelines.
if self.pipeline.tenant.layout.getProjectPipelineConfig(ci):
self.sendReport(actions, ci)
self.dequeueItem(ci)
# Only report the item if the project is in the current
# pipeline. Otherwise the change could be spammed by
# reports from unrelated pipelines.
if self.pipeline.tenant.layout.getProjectPipelineConfig(ci):
self.sendReport(actions, ci)
finally:
# Ensure that the item is dequeued in any case. Otherwise we
# might leak items caused by this temporary enqueue.
self.dequeueItem(ci)
# We don't use reportNormalBuildsetEnd here because we want to
# report even with no jobs.
self.sql.reportBuildsetEnd(ci.current_build_set,