zuul
/
zuul
Code Issues Proposed changes

Merge "Don't decrease window size on merge failure"

This commit is contained in:
Zuul 2020-07-16 11:51:37 +00:00 committed by Gerrit Code Review
parent eb1531ba47 dd631cae8c
commit b7ff8e25a0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zuul/manager/__init__.py
View File

@ -1123,9 +1123,10 @@ class PipelineManager(metaclass=ABCMeta):
log.info("Reported change %s did not merge because it %s,"
"status: all-succeeded: %s, merged: %s",
item.change, error_reason, succeeded, merged)
change_queue.decreaseWindowSize()
log.debug("%s window size decreased to %s",
change_queue, change_queue.window)
if not succeeded:
change_queue.decreaseWindowSize()
log.debug("%s window size decreased to %s",
change_queue, change_queue.window)
raise exceptions.MergeFailure(
"Change %s failed to merge" % item.change)
else: