Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix broken pool drainer after the upgrade. 

See 6cd5cc375a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb (L467)

We think there is a leak at the moment because a discarded pool
belonging to the parent process shouldn't be present in the
forked process.
This commit is contained in:
Guo Xiang Tan 2018-06-08 13:16:25 +08:00
parent f5ad0022f7
commit 29c1f01494
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/freedom_patches/pool_drainer.rb
View File

@ -26,6 +26,7 @@ class ActiveRecord::ConnectionAdapters::ConnectionPool
# if idle_time is specified only connections idle for N seconds will be drained # if idle_time is specified only connections idle for N seconds will be drained
def drain(idle_time = nil, max_age = nil) def drain(idle_time = nil, max_age = nil)
synchronize do synchronize do
if @available && @connections
@available.clear @available.clear
@connections.delete_if do |conn| @connections.delete_if do |conn|
try_drain?(conn, idle_time, max_age) try_drain?(conn, idle_time, max_age)
@ -35,6 +36,7 @@ class ActiveRecord::ConnectionAdapters::ConnectionPool
@available.add conn if !conn.in_use? @available.add conn if !conn.in_use?
end end
end end
end
end end