mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #25707 from matthewd/double-reap
Don't reap connections that have already been reassigned
This commit is contained in:
commit
aeba05d389
4 changed files with 50 additions and 11 deletions
|
@ -1,3 +1,10 @@
|
|||
* Ensure concurrent invocations of the connection reaper cannot allocate the
|
||||
same connection to two threads.
|
||||
|
||||
Fixes #25585.
|
||||
|
||||
*Matthew Draper*
|
||||
|
||||
* Inspecting an object with an associated array of over 10 elements no longer
|
||||
truncates the array, preventing `inspect` from looping infinitely in some
|
||||
cases.
|
||||
|
|
|
@ -415,7 +415,10 @@ module ActiveRecord
|
|||
with_exclusively_acquired_all_connections(raise_on_acquisition_timeout) do
|
||||
synchronize do
|
||||
@connections.each do |conn|
|
||||
checkin conn
|
||||
if conn.in_use?
|
||||
conn.steal!
|
||||
checkin conn
|
||||
end
|
||||
conn.disconnect!
|
||||
end
|
||||
@connections = []
|
||||
|
@ -447,7 +450,10 @@ module ActiveRecord
|
|||
with_exclusively_acquired_all_connections(raise_on_acquisition_timeout) do
|
||||
synchronize do
|
||||
@connections.each do |conn|
|
||||
checkin conn
|
||||
if conn.in_use?
|
||||
conn.steal!
|
||||
checkin conn
|
||||
end
|
||||
conn.disconnect! if conn.requires_reloading?
|
||||
end
|
||||
@connections.delete_if(&:requires_reloading?)
|
||||
|
@ -556,17 +562,17 @@ module ActiveRecord
|
|||
stale_connections = synchronize do
|
||||
@connections.select do |conn|
|
||||
conn.in_use? && !conn.owner.alive?
|
||||
end.each do |conn|
|
||||
conn.steal!
|
||||
end
|
||||
end
|
||||
|
||||
stale_connections.each do |conn|
|
||||
synchronize do
|
||||
if conn.active?
|
||||
conn.reset!
|
||||
checkin conn
|
||||
else
|
||||
remove conn
|
||||
end
|
||||
if conn.active?
|
||||
conn.reset!
|
||||
checkin conn
|
||||
else
|
||||
remove conn
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -184,7 +184,30 @@ module ActiveRecord
|
|||
|
||||
# this method must only be called while holding connection pool's mutex
|
||||
def expire
|
||||
@owner = nil
|
||||
if in_use?
|
||||
if @owner != Thread.current
|
||||
raise ActiveRecordError, "Cannot expire connection, " <<
|
||||
"it is owned by a different thread: #{@owner}. " <<
|
||||
"Current thread: #{Thread.current}."
|
||||
end
|
||||
|
||||
@owner = nil
|
||||
else
|
||||
raise ActiveRecordError, 'Cannot expire connection, it is not currently leased.'
|
||||
end
|
||||
end
|
||||
|
||||
# this method must only be called while holding connection pool's mutex (and a desire for segfaults)
|
||||
def steal! # :nodoc:
|
||||
if in_use?
|
||||
if @owner != Thread.current
|
||||
pool.send :remove_connection_from_thread_cache, self, @owner
|
||||
|
||||
@owner = Thread.current
|
||||
end
|
||||
else
|
||||
raise ActiveRecordError, 'Cannot steal connection, it is not currently leased.'
|
||||
end
|
||||
end
|
||||
|
||||
def unprepared_statement
|
||||
|
|
|
@ -151,7 +151,7 @@ module ActiveRecord
|
|||
|
||||
assert_equal 1, active_connections(@pool).size
|
||||
ensure
|
||||
@pool.connections.each(&:close)
|
||||
@pool.connections.each { |conn| conn.close if conn.in_use? }
|
||||
end
|
||||
|
||||
def test_remove_connection
|
||||
|
@ -432,6 +432,9 @@ module ActiveRecord
|
|||
Thread.new { @pool.send(group_action_method) }.join
|
||||
# assert connection has been forcefully taken away from us
|
||||
assert_not @pool.active_connection?
|
||||
|
||||
# make a new connection for with_connection to clean up
|
||||
@pool.connection
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue