Rebase consistently fails with "iteration reached an end"
In GitLab.com I'm being able to consistently reproduce a Rebase failed. Please rebase locally. Please try again.
scenario in any merge request (see oswaldo/reproduce-rebase-problem!1). How to reproduce:
- Create a project and merge request
- Update the source branch with a commit and target branch with a commit
- Set
Merge method
toMerge commit with semi-linear history
orFast-forward merge
underSettings -> General -> Merge requests -> Merge method
At the MR, you'll see the Rebase
button is available. Clicking it will present a Rebase failed. Please rebase locally. Please try again.
message.
If we go to Kibana, we can see the logs of the RebaseService
: https://log.gitlab.net/app/kibana#/discover?_g=h@44136fa&_a=h@366f6e1. For each Rebase
button click we'll see two log errors:
MergeRequests::RebaseService error (oswaldo/reproduce-rebase-problem!1): Rebase failed. Please rebase locally
MergeRequests::RebaseService error (oswaldo/reproduce-rebase-problem!1): iteration reached an end
Note that RebaseService
logs the error but swallows it, so maybe it's has been happening for a while and wasn't noticed?
I can't reproduce the same error locally.
Could that be the case that response_enum
is/can be an empty enumerable, so a next
call would raise it? Could that come as an error from Gitaly directly (for calling next
for session
)?
cc @.luke @nick.thomas @m_gill This sounds like a ~P2 and potential ~P1. Still, it's odd that I'm not seeing issues on this yet.