autoupdate: fix: status of previous HEAD commit is evaluated after base branch update #109
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of logging the ready for merge status only in resumeIfPRMergeStatusPositive, always log it with a debug message when it succeeds. The review decision, ci_statuses and ci status summary fields are also not added to the logger anymore in updatePR() and included in all further log messages. It is unnecessary to include it in multiple log messages.
Change GithubClient.UpdateBranch to return the commit ID for that the update was triggered. If it the branch is already uptodate it returns the current head commit.
If the status is fetched for a different commit then the current HEAD commit, log warning message. This might happen when the GitHub API returns outdated information, or the PR branch changed between both API calls. Goordinator is currently not handling the situation. It can cause that a PR is suspended wrongly because of the status of a previous commit.
If an update of a PR with it's base branch is scheduled and UpdateBranch is called again until it returns that the branch is uptodate, updatePRWithBase returns wrongly that the PR did not change. This causes that updatePR() continues to run with the ready for merge status of the previous HEAD commit. If that one had failed checks it causes the PR to be suspended. Fix it by returning changed=true if updatePRWithBase scheduled a update or the branch was updated immediately via the github client.
- add set.Set.Contains() helper method
- replace usages of map[string]struct{} with our set.Set type
- replace cpBranchNames() with maps.Clone()
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a Pull-Request was updated with it's base branch by the autoupdater, the GitHub Check status of the previous HEAD commit was evaluated.
If the check status for it was negative, the PR was suspended wrongly.
This PR fixes the issue.
The autoupdater now also logs a warning message if a check status for a different commit then the current HEAD commit returned by the update operation was retrieved.
This could happen if the branch is updated between the both API operations or GitHub returned old information (which can happen).
The autoupdater is not able to handle the situation correctly.