zuul
/
zuul
Code Issues Proposed changes

Log item related messages with event id 

A few messages in the scheduler so far were not using the annotated
logger. This means that those messages could not be easily correlated
via the event id. Improve this by using the annotated logger when
possible.

Change-Id: I4378e6db7e7fb0af2c29e1a226343b25de2ce508
This commit is contained in:
Simon Westphahl 2023-06-22 11:20:02 +02:00
parent 2bdc98b6d3
commit 7992ff08c6
No known key found for this signature in database
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zuul/scheduler.py
View File

@ -1695,9 +1695,9 @@ class Scheduler(threading.Thread):
item, last_head, old_item_ahead,
item_ahead_valid=item_ahead_valid)
except Exception:
self.log.exception(
"Exception while re-enqueing item %s",
item)
log = get_annotated_logger(self.log, item.event)
log.exception(
"Exception while re-enqueing item %s", item)
if reenqueued:
for build in item.current_build_set.getBuilds():
new_job = item.getJob(build.job.name)
@ -1722,8 +1722,8 @@ class Scheduler(threading.Thread):
new_queue.window_floor))
new_pipeline.state.removeOldQueue(context, shared_queue)
for item in items_to_remove:
self.log.info(
"Removing item %s during reconfiguration" % (item,))
log = get_annotated_logger(self.log, item.event)
log.info("Removing item %s during reconfiguration", item)
for build in item.current_build_set.getBuilds():
builds_to_cancel.append(build)
for request_job, request in \
@ -1740,7 +1740,7 @@ class Scheduler(threading.Thread):
item.current_build_set, 'dequeue',
final=False, result='DEQUEUED')
except Exception:
self.log.exception(
log.exception(
"Error reporting buildset completion to DB:")
for build in builds_to_cancel:
@ -2073,7 +2073,8 @@ class Scheduler(threading.Thread):
and item.change.number == change.number
and item.change.patchset == change.patchset
) or (item.change.ref == change.ref)):
self.log.info("Item %s is superceded, dequeuing", item)
log = get_annotated_logger(self.log, item.event)
log.info("Item %s is superceded, dequeuing", item)
pipeline.manager.removeItem(item)
return