Skip to content
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

Backport prevent deadlocks with load interlock and DB lock to 5-1-stable #31174

Merged
merged 1 commit into from
Nov 17, 2017
Merged

Backport prevent deadlocks with load interlock and DB lock to 5-1-stable #31174

merged 1 commit into from
Nov 17, 2017

Conversation

BrentWheeldon
Copy link
Contributor

Summary

This backports #31035 which fixes an issue where competing threads deadlock each other to the 5.1 branch.

  • Thread A holds the load interlock but is blocked on getting the DB lock
  • Thread B holds the DB lock but is blocked on getting the load interlock (for example when there is a Model.transaction block that needs to autoload)

This solution allows for dependency loading in other threads while a thread is waiting to acquire the DB lock.

This fixes an issue where competing threads deadlock each other.

- Thread A holds the load interlock but is blocked on getting the DB lock
- Thread B holds the DB lock but is blocked on getting the load interlock (for example when there is a `Model.transaction` block that needs to autoload)

This solution allows for dependency loading in other threads while a thread is waiting to acquire the DB lock.

Fixes #31019
@rails-bot
Copy link

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @schneems (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@rails-bot
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against 5-1-stable. Please double check that you specified the right target!

@BrentWheeldon
Copy link
Contributor Author

Thanks, @rafaelfranca!

@BrentWheeldon BrentWheeldon deleted the bmw-db-load-deadlock-5-1 branch November 17, 2017 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants