Skip to content

fix(gitlab): retry failed merges due to server still processing merge request #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christiansiegel merged 2 commits into from
Mar 10, 2021
Merged

fix(gitlab): retry failed merges due to server still processing merge request #154

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf1a0f2
fix(gitlab): retry failed merges due to server still processing merge…
ochrstn Mar 9, 2021
fc0d875
fix(gitlab): log failed merge attempts as warning and refer to origin…
ochrstn Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion gitopscli/git_api/gitlab_git_repo_api_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
from typing import Optional
import logging
import time
import requests

import gitlab
from gitopscli.gitops_exception import GitOpsException

from .git_repo_api import GitRepoApi

MAX_MERGE_RETRIES = 5


class GitlabGitRepoApiAdapter(GitRepoApi):
def __init__(
Expand Down Expand Up @@ -57,7 +61,22 @@ def create_pull_request(

def merge_pull_request(self, pr_id: int) -> None:
merge_request = self.__project.mergerequests.get(pr_id)
merge_request.merge()

max_retries = MAX_MERGE_RETRIES
while max_retries > 0:
try:
merge_request.merge()
return
except gitlab.exceptions.GitlabMRClosedError as ex:
# "Branch cannot be merged" error can occur if the server
# is still processing the merge request internally
max_retries -= 1
logging.warning(
"Retry merging pull request. Attempts: (%s/%s)", MAX_MERGE_RETRIES - max_retries, MAX_MERGE_RETRIES
)
if max_retries == 0:
raise GitOpsException("Error merging pull request: 'Branch cannot be merged'") from ex
time.sleep(2.5)

def add_pull_request_comment(self, pr_id: int, text: str, parent_id: Optional[int] = None) -> None:
merge_request = self.__project.mergerequests.get(pr_id)
Expand Down