This repository has been archived by the owner on Apr 18, 2018. It is now read-only.
Make verify realtime #83
Merged
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
SHAs were getting set very slowly since they could be stuck behind conflict checking jobs in the GitQueue. This caused problems where two verify jobs could end up both running after an edit, which would raise a GitError, as well as the issue of external resources reliant on pickme SHA not being usable. This patch breaks the GitQueue into two queues with two workers; one for SHA fetching, that queries the remote, and one for conflict checking, which uses the local git repo.
|
great. this simplifies the git workers again. This is a good idea. |
Don't throw a duplicate SHA error if you are comparing the pickme to itself.
|
⛵ |
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
Separate git sha retrieval from git merge conflict detection. Use separate worker queues to run branch verification and git merge conflict detection. Git merge conflict detection takes more time and should not be blocking branch verification.
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
Merged
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
ymilki
added a commit
that referenced
this pull request
Aug 18, 2014
Release 0.3.3 BUG FIXES * Don't run merge detection on merged requests (rschlaikjer, #84, #91) * Fetch non-ff branches (rschlaikjer, #85, #90) IMPROVEMENTS * Manually rerun merge detection (rschlaikjer, #86, #92) PERFORMANCE TWEAKS * Separate git sha retrieval from git merge conflict detection. (rschlaikjer, #82, #83)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Run SHA fetching and conflict checking separately
SHAs were getting set very slowly since they could be stuck behind conflict
checking jobs in the GitQueue. This caused problems where two verify jobs
could end up both running after an edit, which would raise a GitError, as
well as the issue of external resources reliant on pickme SHA not being usable.
This patch breaks the GitQueue into two queues with two workers; one for SHA
fetching, that queries the remote, and one for conflict checking, which uses
the local git repo.