mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
774c460e60
* Improve OOB hook This moves the hook to be executed outside of busy loop considering the thread to be truly idle at a time of execution of the hook * Further improvements to out-of-band hook * Don't trigger OOB on partially-queued requests * Don't accept new connections during OOB * Move tests to `TestOutOfBandServer` Co-authored-by: Kamil Trzcinski <ayufan@ayufan.eu> Co-authored-by: Nate Berkopec <nate.berkopec@gmail.com>
159 lines
4.1 KiB
Ruby
159 lines
4.1 KiB
Ruby
require_relative "helper"
|
|
require "puma/events"
|
|
|
|
class TestOutOfBandServer < Minitest::Test
|
|
parallelize_me!
|
|
|
|
def setup
|
|
@ios = []
|
|
@server = nil
|
|
@oob_finished = ConditionVariable.new
|
|
@app_finished = ConditionVariable.new
|
|
end
|
|
|
|
def teardown
|
|
@oob_finished.broadcast
|
|
@app_finished.broadcast
|
|
@server.stop(true) if @server
|
|
@ios.each {|i| i.close unless i.closed?}
|
|
end
|
|
|
|
def new_connection
|
|
TCPSocket.new('127.0.0.1', @server.connected_ports[0]).tap {|s| @ios << s}
|
|
rescue IOError
|
|
Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
|
|
retry
|
|
end
|
|
|
|
def send_http(req)
|
|
new_connection << req
|
|
end
|
|
|
|
def send_http_and_read(req)
|
|
send_http(req).read
|
|
end
|
|
|
|
def oob_server(**options)
|
|
@request_count = 0
|
|
@oob_count = 0
|
|
in_oob = Mutex.new
|
|
@mutex = Mutex.new
|
|
oob_wait = options.delete(:oob_wait)
|
|
oob = -> do
|
|
in_oob.synchronize do
|
|
@mutex.synchronize do
|
|
@oob_count += 1
|
|
@oob_finished.signal
|
|
@oob_finished.wait(@mutex, 1) if oob_wait
|
|
end
|
|
end
|
|
end
|
|
app_wait = options.delete(:app_wait)
|
|
app = ->(_) do
|
|
raise 'OOB conflict' if in_oob.locked?
|
|
@mutex.synchronize do
|
|
@request_count += 1
|
|
@app_finished.signal
|
|
@app_finished.wait(@mutex, 1) if app_wait
|
|
end
|
|
[200, {}, [""]]
|
|
end
|
|
|
|
@server = Puma::Server.new app, Puma::Events.strings, out_of_band: [oob], **options
|
|
@server.min_threads = options[:min_threads] || 1
|
|
@server.max_threads = options[:max_threads] || 1
|
|
@server.add_tcp_listener '127.0.0.1', 0
|
|
@server.run
|
|
end
|
|
|
|
# Sequential requests should trigger out_of_band after every request.
|
|
def test_sequential
|
|
n = 100
|
|
oob_server
|
|
n.times do
|
|
@mutex.synchronize do
|
|
send_http "GET / HTTP/1.0\r\n\r\n"
|
|
@oob_finished.wait(@mutex, 1)
|
|
end
|
|
end
|
|
assert_equal n, @request_count
|
|
assert_equal n, @oob_count
|
|
end
|
|
|
|
# Stream of requests on concurrent connections should trigger
|
|
# out_of_band hooks only once after the final request.
|
|
def test_stream
|
|
oob_server app_wait: true, max_threads: 2
|
|
n = 100
|
|
Array.new(n) {send_http("GET / HTTP/1.0\r\n\r\n")}
|
|
Thread.pass until @request_count == n
|
|
@mutex.synchronize do
|
|
@app_finished.signal
|
|
@oob_finished.wait(@mutex, 1)
|
|
end
|
|
assert_equal n, @request_count
|
|
assert_equal 1, @oob_count
|
|
end
|
|
|
|
# New requests should not get processed while OOB is running.
|
|
def test_request_overlapping_hook
|
|
oob_server oob_wait: true, max_threads: 2
|
|
|
|
# Establish connection for Req2 before OOB
|
|
req2 = new_connection
|
|
sleep 0.01
|
|
|
|
@mutex.synchronize do
|
|
send_http "GET / HTTP/1.0\r\n\r\n"
|
|
@oob_finished.wait(@mutex) # enter OOB
|
|
|
|
# Send Req2
|
|
req2 << "GET / HTTP/1.0\r\n\r\n"
|
|
# If Req2 is processed now it raises 'OOB Conflict' in the response.
|
|
sleep 0.01
|
|
|
|
@oob_finished.signal # exit OOB
|
|
# Req2 should be processed now.
|
|
@oob_finished.wait(@mutex, 1) # enter OOB
|
|
@oob_finished.signal # exit OOB
|
|
end
|
|
|
|
refute_match(/OOB conflict/, req2.read)
|
|
end
|
|
|
|
# Partial requests should not trigger OOB.
|
|
def test_partial_request
|
|
oob_server
|
|
new_connection.close
|
|
sleep 0.01
|
|
assert_equal 0, @oob_count
|
|
end
|
|
|
|
# OOB should be triggered following a completed request
|
|
# concurrent with other partial requests.
|
|
def test_partial_concurrent
|
|
oob_server max_threads: 2
|
|
@mutex.synchronize do
|
|
send_http("GET / HTTP/1.0\r\n\r\n")
|
|
100.times {new_connection.close}
|
|
@oob_finished.wait(@mutex, 1)
|
|
end
|
|
assert_equal 1, @oob_count
|
|
end
|
|
|
|
# OOB should block new connections from being accepted.
|
|
def test_blocks_new_connection
|
|
oob_server oob_wait: true, max_threads: 2
|
|
@mutex.synchronize do
|
|
send_http("GET / HTTP/1.0\r\n\r\n")
|
|
@oob_finished.wait(@mutex)
|
|
end
|
|
accepted = false
|
|
io = @server.binder.ios.last
|
|
io.stub(:accept_nonblock, -> {accepted = true; new_connection}) do
|
|
new_connection.close
|
|
sleep 0.01
|
|
end
|
|
refute accepted, 'New connection accepted during out of band'
|
|
end
|
|
end
|