zuul
/
zuul
Code Issues Proposed changes

Merge "Don't trace merge jobs that we don't lock"

This commit is contained in:
Zuul 2022-10-06 16:33:32 +00:00 committed by Gerrit Code Review
parent 13790e2444 e68f2bfdb3
commit e2318a5365
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zuul/merger/server.py
View File

@ -208,22 +208,25 @@ class BaseMergeServer(metaclass=ABCMeta):
if not self._merger_running:
break
with tracing.startSpanInContext(
merge_request.span_context, "MergerJob",
attributes={"merger": self.hostname}):
self._runMergeJob(merge_request)
self._lockAndRunMergeJob(merge_request)
except Exception:
self.log.exception("Error in merge thread:")
time.sleep(5)
self.merger_loop_wake_event.set()
def _lockAndRunMergeJob(self, merge_request):
# Lock and update the merge request
if not self.merger_api.lock(merge_request, blocking=False):
return
with tracing.startSpanInContext(
merge_request.span_context, "MergerJob",
attributes={"merger": self.hostname}):
self._runMergeJob(merge_request)
def _runMergeJob(self, merge_request):
log = get_annotated_logger(
self.log, merge_request.event_id
)
# Lock and update the merge request
if not self.merger_api.lock(merge_request, blocking=False):
return
# Ensure that the request is still in state requested. This method is
# called based on cached data and there might be a mismatch between the