logstash-core 6.2.3-java → 6.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 842b9cf844ccb8a75ddd512b4f746ca8838da5ce9bbd3c083b8a2dbdbdf681b3
-  data.tar.gz: 3b56f165291c4ff37f33cc59d4f705ac1cff4bd2b4fdc836be85d7be2b2cec21
+  metadata.gz: f0c1ebf3c38d227994519be789ac1c8cdc2e37668f80ee8ce8058007fb3b17aa
+  data.tar.gz: 6b4aeacf0b5d7753a8e7365e46f9c1d0580d4a2b516e07342a74202fecab1168
 SHA512:
-  metadata.gz: e88de1a0923983de507e9a8ee32c420d027465c8dd648fc49d2df422bccab019aab4892dce982b74e853389f14e99bf73d8d0ef183b9b20d8733f8f6030cb636
-  data.tar.gz: 1d4e4aef5faa4dea2a16f17d34efb24651c61de3bbe60cef5ae5a8970dd0d6207d3067abe12a915e220a911800b2da2864ba48752b5505c25fcd357b3ccff35b
+  metadata.gz: d1a7c97f81eacf05460f2213748f7a764b74d4e9d5891e373066792cffe98a1e3a366ec1a07d259daf6a9c84fbe646df45a0b4f619e35108db0e6cd422c75972
+  data.tar.gz: 72636dc03260c5b700adc426c1494946fcff6ba0bc3f60ff49e253d83f786675f0dbe311c9fdc09c61a18ec67eb115c2fdfe7b282c84d3cd29b0448880a41f12

data/lib/logstash/compiler/lscl.rb

@@ -181,7 +181,7 @@ module LogStashCompilerLSCLGrammar; module LogStash; module Compiler; module LSC
       duplicate_values = find_duplicate_keys
 
       if duplicate_values.size > 0
-        raise ConfigurationError.new(
+        raise ::LogStash::ConfigurationError.new(
           I18n.t("logstash.runner.configuration.invalid_plugin_settings_duplicate_keys",
             :keys => duplicate_values.join(', '),
             :line => input.line_of(interval.first),

data/lib/logstash/pipeline.rb

@@ -196,6 +196,7 @@ module LogStash; class Pipeline < BasePipeline
     @running = Concurrent::AtomicBoolean.new(false)
     @flushing = Concurrent::AtomicReference.new(false)
     @outputs_registered = Concurrent::AtomicBoolean.new(false)
+    @worker_shutdown = java.util.concurrent.atomic.AtomicBoolean.new(false)
   end # def initialize
 
   def ready?
@@ -257,7 +258,7 @@ module LogStash; class Pipeline < BasePipeline
     status = wait_until_started
 
     if status
-      @logger.info("Pipeline started succesfully", default_logging_keys)
+      @logger.info("Pipeline started successfully", default_logging_keys)
     end
 
     status
@@ -411,13 +412,10 @@ module LogStash; class Pipeline < BasePipeline
   # Main body of what a worker thread does
   # Repeatedly takes batches off the queue, filters, then outputs them
   def worker_loop(batch_size, batch_delay)
-    shutdown_requested = false
-
     @filter_queue_client.set_batch_dimensions(batch_size, batch_delay)
     output_events_map = Hash.new { |h, k| h[k] = [] }
     while true
       signal = @signal_queue.poll || NO_SIGNAL
-      shutdown_requested |= signal.shutdown? # latch on shutdown signal
 
       batch = @filter_queue_client.read_batch # metrics are started in read_batch
       batch_size = batch.size
@@ -431,7 +429,7 @@ module LogStash; class Pipeline < BasePipeline
         @filter_queue_client.close_batch(batch)
       end
       # keep break at end of loop, after the read_batch operation, some pipeline specs rely on this "final read_batch" before shutdown.
-      break if (shutdown_requested && !draining_queue?)
+      break if (@worker_shutdown.get && !draining_queue?)
     end
 
     # we are shutting down, queue is drained if it was required, now  perform a final flush.
@@ -576,11 +574,8 @@ module LogStash; class Pipeline < BasePipeline
   # tell the worker threads to stop and then block until they've fully stopped
   # This also stops all filter and output plugins
   def shutdown_workers
-    # Each worker thread will receive this exactly once!
-    @worker_threads.each do |t|
-      @logger.debug("Pushing shutdown", default_logging_keys(:thread => t.inspect))
-      @signal_queue.put(SHUTDOWN)
-    end
+    @logger.debug("Setting shutdown", default_logging_keys)
+    @worker_shutdown.set(true)
 
     @worker_threads.each do |t|
       @logger.debug("Shutdown waiting for worker thread" , default_logging_keys(:thread => t.inspect))

data/spec/logstash/pipeline_spec.rb

@@ -22,6 +22,15 @@ class DummyInput < LogStash::Inputs::Base
   end
 end
 
+# This input runs long enough that a flush should occur
+class DummyFlushEnablingInput < DummyInput
+  def run(queue)
+    while !stop?
+      sleep 1
+    end
+  end
+end
+
 class DummyInputGenerator < LogStash::Inputs::Base
   config_name "dummyinputgenerator"
   milestone 2
@@ -650,7 +659,7 @@ describe LogStash::Pipeline do
 
     before do
       allow(::LogStash::Outputs::DummyOutput).to receive(:new).with(any_args).and_return(output)
-      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(DummyInput)
+      allow(LogStash::Plugin).to receive(:lookup).with("input", "dummy_input").and_return(DummyFlushEnablingInput)
       allow(LogStash::Plugin).to receive(:lookup).with("filter", "dummy_flushing_filter").and_return(DummyFlushingFilterPeriodic)
       allow(LogStash::Plugin).to receive(:lookup).with("output", "dummy_output").and_return(::LogStash::Outputs::DummyOutput)
       allow(LogStash::Plugin).to receive(:lookup).with("codec", "plain").and_return(LogStash::Codecs::Plain)

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.2.3
-logstash-core: 6.2.3
+logstash: 6.2.4
+logstash-core: 6.2.4
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.2.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement