-
-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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.
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
Ensure that sessions are passed into queries that could use the database to prevent deadlocks #5718
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
Signed-off-by: Andrew Thornton <[email protected]>
Signed-off-by: Andrew Thornton <[email protected]>
… the session Signed-off-by: Andrew Thornton <[email protected]>
Signed-off-by: Andrew Thornton <[email protected]>
Signed-off-by: Andrew Thornton <[email protected]>
zeripath
changed the title
More deadlocks
Ensure that sessions are passed into queries that could use the database to prevent deadlocks
Jan 13, 2019
lunny
requested changes
Jan 13, 2019
bkcsoft
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Jan 13, 2019
Codecov Report
@@ Coverage Diff @@
## master #5718 +/- ##
==========================================
+ Coverage 37.75% 37.76% +<.01%
==========================================
Files 325 325
Lines 47640 47650 +10
==========================================
+ Hits 17988 17994 +6
- Misses 27058 27062 +4
Partials 2594 2594
Continue to review full report at Codecov.
|
lafriks
approved these changes
Jan 14, 2019
bkcsoft
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Jan 14, 2019
lunny
approved these changes
Jan 14, 2019
bkcsoft
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Jan 14, 2019
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.
I've looked through the gitea code following the use x.NewSession() checking whether every request is made within the session in an attempt to prevent a deadlock.
This PR accounts for most of the potential deadlocks I've found in those requests.
Issues
models/repo_mirror.go:SyncMirrors()
doesn't pass its session down to its children calls however, it doesn't create a transaction (despite updating the db) - this is likely reasonable as the transaction would lock the db whilst these somewhat long actions were ongoing. This could be refactored to have an ongoing mirror action flag in the db (changed and checked with a transaction of course) that would be cleaned up at the end of the method if data consistency was at risk from this. (I haven't looked deep into this and this is likely a non-issue.)