diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-18 00:25:52 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 00:25:52 +1030 |
| commit | 56c1326abb11ed275f04b6e0592ca66975e37f24 (patch) | |
| tree | 6a7718a66d73d0369a33caeb4b4cdd87c44ebbad /activesupport/lib/active_support | |
| parent | eed3d3fff5ca6be00b2fe0fe020bd025ddbabbd5 (diff) | |
| parent | 1f9f6f6cfc57020ccb35f77872c56f069f337075 (diff) | |
| download | rails-56c1326abb11ed275f04b6e0592ca66975e37f24.tar.gz rails-56c1326abb11ed275f04b6e0592ca66975e37f24.tar.bz2 rails-56c1326abb11ed275f04b6e0592ca66975e37f24.zip | |
Merge pull request #31035 from BrentWheeldon/bmw-db-load-deadlock
Prevent deadlocks with load interlock and DB lock.
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb new file mode 100644 index 0000000000..a8455c0048 --- /dev/null +++ b/activesupport/lib/active_support/concurrency/load_interlock_aware_monitor.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require "monitor" + +module ActiveSupport + module Concurrency + # A monitor that will permit dependency loading while blocked waiting for + # the lock. + class LoadInterlockAwareMonitor < Monitor + # Enters an exclusive section, but allows dependency loading while blocked + def mon_enter + mon_try_enter || + ActiveSupport::Dependencies.interlock.permit_concurrent_loads { super } + end + end + end +end |