diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-11-25 01:52:46 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 01:52:46 +1030 |
| commit | 3b13761458d892c050ee10454c19d17638154c5a (patch) | |
| tree | 7f71d8eafe3abadc3d556a84a38d5020d3fc81e8 /activerecord/test | |
| parent | 33039fa7239afdde963fe651637226a7dca4b85b (diff) | |
| parent | d314646c965b045724e6bdb9d61dcecfabc0ba8f (diff) | |
| download | rails-3b13761458d892c050ee10454c19d17638154c5a.tar.gz rails-3b13761458d892c050ee10454c19d17638154c5a.tar.bz2 rails-3b13761458d892c050ee10454c19d17638154c5a.zip | |
Merge pull request #27108 from matthewd/allocate-connections-after-blocking
Distribute connections to previously blocked threads when we're done
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/connection_pool_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/test/cases/connection_pool_test.rb b/activerecord/test/cases/connection_pool_test.rb index b08e4f603c..2437c99621 100644 --- a/activerecord/test/cases/connection_pool_test.rb +++ b/activerecord/test/cases/connection_pool_test.rb @@ -487,12 +487,6 @@ module ActiveRecord #--- post test clean up start second_thread_done.count_down if failed - # after `pool.disconnect()` the first thread will be left stuck in queue, no need to wait for - # it to timeout with ConnectionTimeoutError - if (group_action_method == :disconnect || group_action_method == :disconnect!) && pool.num_waiting_in_queue > 0 - pool.with_connection {} # create a new connection in case there are threads still stuck in a queue - end - first_thread.join second_thread.join #--- post test clean up end |