zuul
/
zuul
Code Issues Proposed changes

Offload repo reset during merge 

Change I99f0c8edaae2185c5dbf855398ace2522237226d allowed offloading the
repo reset to a process pool. We can take advandage of this also for the
the repo reset during merge as this is also taking longer under high
load.

Change-Id: I14e704ab818c8c2e0405f0adfc55cee564ed4d1e
This commit is contained in:
Simon Westphahl 2020-09-14 10:19:30 +02:00
parent 8ed696f626
commit fd52935b3d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zuul/merger/merger.py
View File

@ -903,7 +903,8 @@ class Merger(object):
# we need to reset here in order to call getBranchHead
log.debug("No base commit found for %s" % (key,))
try:
repo.reset(zuul_event_id=zuul_event_id)
repo.reset(zuul_event_id=zuul_event_id,
process_worker=process_worker)
except Exception:
log.exception("Unable to reset repo %s" % repo)
return None, None