Skip to content

Commit

Permalink
Reduce sleep time in request pool spec (mastodon#25470)
Browse files Browse the repository at this point in the history
  • Loading branch information
mjankowski authored Jun 19, 2023
1 parent cec4f1d commit e1c9d52
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 9 deletions.
5 changes: 3 additions & 2 deletions app/lib/request_pool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ def run
end

MAX_IDLE_TIME = 30
WAIT_TIMEOUT = 5
MAX_POOL_SIZE = ENV.fetch('MAX_REQUEST_POOL_SIZE', 512).to_i
REAPER_FREQUENCY = 30
WAIT_TIMEOUT = 5

class Connection
attr_reader :site, :last_used_at, :created_at, :in_use, :dead, :fresh
Expand Down Expand Up @@ -98,7 +99,7 @@ def current_time

def initialize
@pool = ConnectionPool::SharedConnectionPool.new(size: MAX_POOL_SIZE, timeout: WAIT_TIMEOUT) { |site| Connection.new(site) }
@reaper = Reaper.new(self, 30)
@reaper = Reaper.new(self, REAPER_FREQUENCY)
@reaper.run
end

Expand Down
23 changes: 16 additions & 7 deletions spec/lib/request_pool_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,25 @@
expect(subject.size).to be > 1
end

it 'closes idle connections' do
stub_request(:get, 'http://example.com/').to_return(status: 200, body: 'Hello!')
context 'with an idle connection' do
before do
stub_const('RequestPool::MAX_IDLE_TIME', 1) # Lower idle time limit to 1 seconds
stub_const('RequestPool::REAPER_FREQUENCY', 0.1) # Run reaper every 0.1 seconds
stub_request(:get, 'http://example.com/').to_return(status: 200, body: 'Hello!')
end

subject.with('http://example.com') do |http_client|
http_client.get('/').flush
it 'closes the connections' do
subject.with('http://example.com') do |http_client|
http_client.get('/').flush
end

expect { reaper_observes_idle_timeout }.to change(subject, :size).from(1).to(0)
end

expect(subject.size).to eq 1
sleep RequestPool::MAX_IDLE_TIME + 30 + 1
expect(subject.size).to eq 0
def reaper_observes_idle_timeout
# One full idle period and 2 reaper cycles more
sleep RequestPool::MAX_IDLE_TIME + (RequestPool::REAPER_FREQUENCY * 2)
end
end
end
end

0 comments on commit e1c9d52

Please sign in to comment.