Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server-helper: Fix connection leak by close timing issue. fix #2086 #2087

Merged
merged 2 commits into from
Jul 27, 2018
Merged

server-helper: Fix connection leak by close timing issue. fix #2086 #2087

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f9fde5
server-helper: Fix connection leak by close timing issue. fix #2086
repeatedly Jul 26, 2018
03ae873
server-helper: Fix invalid 'close' call in error
repeatedly Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions lib/fluent/plugin_helper/server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,10 @@ def server_create_for_tcp_connection(shared, bind, port, backlog, socket_option_
socket_option_setter.call(sock)
close_callback = ->(conn){ @_server_mutex.synchronize{ @_server_connections.delete(conn) } }
server = Coolio::TCPServer.new(sock, nil, EventHandler::TCPServer, socket_option_setter, close_callback, @log, @under_plugin_development, block) do |conn|
@_server_mutex.synchronize do
@_server_connections << conn
unless conn.closing
@_server_mutex.synchronize do
@_server_connections << conn
end
end
end
server.listen(backlog) if backlog
Expand All @@ -227,8 +229,10 @@ def server_create_for_tls_connection(shared, bind, port, conf, backlog, socket_o
socket_option_setter.call(sock)
close_callback = ->(conn){ @_server_mutex.synchronize{ @_server_connections.delete(conn) } }
server = Coolio::TCPServer.new(sock, nil, EventHandler::TLSServer, context, socket_option_setter, close_callback, @log, @under_plugin_development, block) do |conn|
@_server_mutex.synchronize do
@_server_connections << conn
unless conn.closing
@_server_mutex.synchronize do
@_server_connections << conn
end
end
end
server.listen(backlog) if backlog
Expand Down Expand Up @@ -538,6 +542,8 @@ def on_readable_with_sock
end

class TCPServer < Coolio::TCPSocket
attr_reader :closing

def initialize(sock, socket_option_setter, close_callback, log, under_plugin_development, connect_callback)
raise ArgumentError, "socket must be a TCPSocket: sock=#{sock}" unless sock.is_a?(TCPSocket)

Expand Down Expand Up @@ -594,7 +600,7 @@ def on_read_without_connection(data)
rescue => e
@log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
@log.error_backtrace
close(true) rescue nil
close rescue nil
raise if @under_plugin_development
end

Expand All @@ -603,7 +609,7 @@ def on_read_with_connection(data)
rescue => e
@log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
@log.error_backtrace
close(true) rescue nil
close rescue nil
raise if @under_plugin_development
end

Expand All @@ -618,6 +624,8 @@ def close
end

class TLSServer < Coolio::Socket
attr_reader :closing

# It can't use Coolio::TCPSocket, because Coolio::TCPSocket checks that underlying socket (1st argument of super) is TCPSocket.
def initialize(sock, context, socket_option_setter, close_callback, log, under_plugin_development, connect_callback)
raise ArgumentError, "socket must be a TCPSocket: sock=#{sock}" unless sock.is_a?(TCPSocket)
Expand Down Expand Up @@ -748,7 +756,7 @@ def on_read_without_connection(data)
rescue => e
@log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
@log.error_backtrace
close(true) rescue nil
close rescue nil
raise if @under_plugin_development
end

Expand All @@ -757,7 +765,7 @@ def on_read_with_connection(data)
rescue => e
@log.error "unexpected error on reading data", host: @callback_connection.remote_host, port: @callback_connection.remote_port, error: e
@log.error_backtrace
close(true) rescue nil
close rescue nil
raise if @under_plugin_development
end

Expand Down