github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove the synchronize on the flush_filters_to_ouputs!

Browse source 
We were synchronizing on the tick and the flush call,
in some situation it could set logstash in a deadlock when the queue was
blocked and the tick occurred. The flush call was already thread safe
since only one worker can start the flushing process.

Fixes #3378
This commit is contained in:
Pier-Hugues Pellerin 2015-06-04 11:09:05 -04:00 • committed by Jordan Sissel
parent d44e6e15a3
commit d2a82b6a77
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/logstash/pipeline.rb
View file

@ -115,7 +115,7 @@ class LogStash::Pipeline
end
def shutdown_filters
@flusher_lock.synchronize { @flusher_thread.kill }
@flusher_thread.kill
@input_to_filter.push(LogStash::SHUTDOWN)
end
@ -156,8 +156,7 @@ class LogStash::Pipeline
Thread.new { filterworker }
end
@flusher_lock = Mutex.new
@flusher_thread = Thread.new { Stud.interval(5) { @flusher_lock.synchronize { @input_to_filter.push(LogStash::FLUSH) } } }
@flusher_thread = Thread.new { Stud.interval(5) { @input_to_filter.push(LogStash::FLUSH) } }
end
def start_outputs
@ -220,7 +219,7 @@ class LogStash::Pipeline
when LogStash::FlushEvent
# handle filter flushing here so that non threadsafe filters (thus only running one filterworker)
# don't have to deal with thread safety implementing the flush method
@flusher_lock.synchronize { flush_filters_to_output! }
flush_filters_to_output!
when LogStash::ShutdownEvent
# pass it down to any other filterworker and stop this worker
@input_to_filter.push(event)