-
-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
Fix deadlock when deleting team user #13092
Merged
lafriks
merged 2 commits into
go-gitea:master
from
zeripath:fix-12983-deadlock-in-delete-team-user
Oct 10, 2020
Merged
Fix deadlock when deleting team user #13092
lafriks
merged 2 commits into
go-gitea:master
from
zeripath:fix-12983-deadlock-in-delete-team-user
Oct 10, 2020
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
`models.getUserRepoPermission(...)` calls `HasOrgVisible` which uses `models.x` potentially outside of the transaction `e` provided as an argument to `getUserRepoPermission`. This PR switches to use `hasOrgVisible(e, ...)`. Fix go-gitea#12983 Signed-off-by: Andrew Thornton <[email protected]>
We need to destroy |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 10, 2020
Backport go-gitea#13092 `models.getUserRepoPermission(...)` calls `HasOrgVisible` which uses `models.x` potentially outside of the transaction `e` provided as an argument to `getUserRepoPermission`. This PR switches to use `hasOrgVisible(e, ...)`. Fix go-gitea#12983 Signed-off-by: Andrew Thornton <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #13092 +/- ##
==========================================
- Coverage 42.61% 42.60% -0.02%
==========================================
Files 673 673
Lines 73862 73862
==========================================
- Hits 31479 31468 -11
- Misses 37276 37280 +4
- Partials 5107 5114 +7
Continue to review full report at Codecov.
|
6543
approved these changes
Oct 10, 2020
lafriks
pushed a commit
that referenced
this pull request
Oct 10, 2020
Backport #13092 `models.getUserRepoPermission(...)` calls `HasOrgVisible` which uses `models.x` potentially outside of the transaction `e` provided as an argument to `getUserRepoPermission`. This PR switches to use `hasOrgVisible(e, ...)`. Fix #12983 Signed-off-by: Andrew Thornton <[email protected]>
lafriks
approved these changes
Oct 10, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport/done
All backports for this PR have been created
issue/critical
This issue should be fixed ASAP. If it is a PR, the PR should be merged ASAP
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
type/bug
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.
models.getUserRepoPermission(...)
callsHasOrgVisible
whichuses
models.x
potentially outside of the transactione
providedas an argument to
getUserRepoPermission
.This PR switches to use
hasOrgVisible(e, ...)
.Fix #12983
Signed-off-by: Andrew Thornton [email protected]