Prevent deadlocks with load interlock and 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
This commit is contained in:
Brent Wheeldon 2017-11-02 14:53:43 -04:00
parent eae65ac2ab
commit 1f9f6f6cfc
No known key found for this signature in database
GPG Key ID: EFCE7466F21DE4A8
3 changed files with 74 additions and 1 deletions

View File

@ -6,6 +6,7 @@ require "active_record/connection_adapters/schema_cache"
require "active_record/connection_adapters/sql_type_metadata"
require "active_record/connection_adapters/abstract/schema_dumper"
require "active_record/connection_adapters/abstract/schema_creation"
require "active_support/concurrency/load_interlock_aware_monitor"
require "arel/collectors/bind"
require "arel/collectors/composite"
require "arel/collectors/sql_string"
@ -108,7 +109,7 @@ module ActiveRecord
@schema_cache = SchemaCache.new self
@quoted_column_names, @quoted_table_names = {}, {}
@visitor = arel_visitor
@lock = Monitor.new
@lock = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
@prepared_statements = true

View File

@ -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

View File

@ -0,0 +1,55 @@
# frozen_string_literal: true
require "abstract_unit"
require "concurrent/atomic/count_down_latch"
require "active_support/concurrency/load_interlock_aware_monitor"
module ActiveSupport
module Concurrency
class LoadInterlockAwareMonitorTest < ActiveSupport::TestCase
def setup
@monitor = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
end
def test_entering_with_no_blocking
assert @monitor.mon_enter
end
def test_entering_with_blocking
load_interlock_latch = Concurrent::CountDownLatch.new
monitor_latch = Concurrent::CountDownLatch.new
able_to_use_monitor = false
able_to_load = false
thread_with_load_interlock = Thread.new do
ActiveSupport::Dependencies.interlock.running do
load_interlock_latch.count_down
monitor_latch.wait
@monitor.synchronize do
able_to_use_monitor = true
end
end
end
thread_with_monitor_lock = Thread.new do
@monitor.synchronize do
monitor_latch.count_down
load_interlock_latch.wait
ActiveSupport::Dependencies.interlock.loading do
able_to_load = true
end
end
end
thread_with_load_interlock.join
thread_with_monitor_lock.join
assert able_to_use_monitor
assert able_to_load
end
end
end
end