mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-05 14:36:04 +00:00
0d9ffe56fb
* Add request pool to improve delivery performance Fix #7909 * Ensure connection is closed when exception interrupts execution * Remove Timeout#timeout from socket connection * Fix infinite retrial loop on HTTP::ConnectionError * Close sockets on failure, reduce idle time to 90 seconds * Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server * Use a shared pool size, 512 by default, to stay below open file limit * Add some tests * Add more tests * Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds * Use a shared pool that returns preferred connection but re-purposes other ones when needed * Fix wrong connection being returned on subsequent calls within the same thread * Reduce mutex calls on flushes from 2 to 1 and add test for reaping
64 lines
1.8 KiB
Ruby
64 lines
1.8 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe RequestPool do
|
|
subject { described_class.new }
|
|
|
|
describe '#with' do
|
|
it 'returns a HTTP client for a host' do
|
|
subject.with('http://example.com') do |http_client|
|
|
expect(http_client).to be_a HTTP::Client
|
|
end
|
|
end
|
|
|
|
it 'returns the same instance of HTTP client within the same thread for the same host' do
|
|
test_client = nil
|
|
|
|
subject.with('http://example.com') { |http_client| test_client = http_client }
|
|
expect(test_client).to_not be_nil
|
|
subject.with('http://example.com') { |http_client| expect(http_client).to be test_client }
|
|
end
|
|
|
|
it 'returns different HTTP clients for different hosts' do
|
|
test_client = nil
|
|
|
|
subject.with('http://example.com') { |http_client| test_client = http_client }
|
|
expect(test_client).to_not be_nil
|
|
subject.with('http://example.org') { |http_client| expect(http_client).to_not be test_client }
|
|
end
|
|
|
|
it 'grows to the number of threads accessing it' do
|
|
stub_request(:get, 'http://example.com/').to_return(status: 200, body: 'Hello!')
|
|
|
|
subject
|
|
|
|
threads = 20.times.map do |i|
|
|
Thread.new do
|
|
20.times do
|
|
subject.with('http://example.com') do |http_client|
|
|
http_client.get('/').flush
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
threads.map(&:join)
|
|
|
|
expect(subject.size).to be > 1
|
|
end
|
|
|
|
it 'closes idle connections' do
|
|
stub_request(:get, 'http://example.com/').to_return(status: 200, body: 'Hello!')
|
|
|
|
subject.with('http://example.com') do |http_client|
|
|
http_client.get('/').flush
|
|
end
|
|
|
|
expect(subject.size).to eq 1
|
|
sleep RequestPool::MAX_IDLE_TIME + 30 + 1
|
|
expect(subject.size).to eq 0
|
|
end
|
|
end
|
|
end
|