logstash-filter-kv 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cb63418024cd83a07e3a1e9d0db30b8b8274abd7f35c510f0c201a23cc4186f
-  data.tar.gz: 5714cdc93d81b6fb667700b3d1667426031d3df240894bea5275a031739449ef
+  metadata.gz: 4a0389b5313b78aef27792109c92631be74a254f23bd0142dae0ba3e79ce59aa
+  data.tar.gz: 3ae71f9cc966cf807a19f78533acb856c1cf4c2bf23bf4057c4fc57eed7a7e5d
 SHA512:
-  metadata.gz: 7973b8e55a4ad5c215da44a1b1ae487c19ad4ec6ba8e47425f61f4667fb73e463100d8a5357e8ca7e4f294265554052e5c2c3ff21f6c497dacbe0bfeaa64d008
-  data.tar.gz: '0956a1d87055c01ebf6aebfa0b2dcf4aa27b680d110192404b0d92db4dbfcb1a5f40cb259dbca820b22e3a3acc9d5dc14f6ffcce4d37d94b5925594bbac76ad2'
+  metadata.gz: ae1f4fe4b27459451f7048fcca0b83a7a3bf4c934eaec7c91384b728bce9fb67589ee0f14403467e3838dccf5957153d4dae887ceca0c3ccd5e158a428d20d89
+  data.tar.gz: 6f823c72944428578a112a622192c2218b5349f35433565f76832d99dc00b827ff9b1255c934f82ce853cd9472d6beec7b83f7a8751cb3e31c9d64926845b153

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.3.2
+ - Resolved potential race condition in pipeline shutdown where the timeout enforcer could be shut down while work was still in-flight, potentially leading to stuck pipelines.
+ - Resolved potential race condition in pipeline shutdown where work could be submitted to the timeout enforcer after it had been shutdown, potentially leading to stuck pipelines.
+
 ## 4.3.1
  - Fixed asciidoc formatting in documentation [#81](https://github.com/logstash-plugins/logstash-filter-kv/pull/81)
 

data/lib/logstash/filters/kv.rb

@@ -609,6 +609,11 @@ class LogStash::Filters::KV < LogStash::Filters::Base
     end
 
     def execute(&block)
+      # If the enforcer is not running, either we failed to start it or it has
+      # already been stopped; in either case, we cannot reliably enforce the timeout
+      # so we raise a RuntimeError instead.
+      fail("TimeoutEnforcer not running.") unless alive?
+
       begin
         thread = java.lang.Thread.currentThread()
         @threads_to_start_time.put(thread, java.lang.System.nanoTime)
@@ -629,7 +634,7 @@ class LogStash::Filters::KV < LogStash::Filters::Base
       @running.set(true)
       @logger.debug("Starting timeout enforcer (#{@timeout_nanos}ns)")
       @timer_thread = Thread.new do
-        while @running.get()
+        while @running.get() || !@threads_to_start_time.is_empty
           begin
             cancel_timed_out!
           rescue Exception => e
@@ -651,6 +656,10 @@ class LogStash::Filters::KV < LogStash::Filters::Base
       @timer_thread.join if @timer_thread
     end
 
+    def alive?
+      @running.get() && @timer_thread && @timer_thread.alive?
+    end
+
     private
 
     def cancel_timed_out!

data/logstash-filter-kv.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-kv'
-  s.version         = '4.3.1'
+  s.version         = '4.3.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Parses key-value pairs"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-kv
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement