logstash-core 5.5.1.snapshot1-java → 5.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985eec72f7499afe23ca1299dbf3c18040ccf979
-  data.tar.gz: 54b4aceb9a9246ecaef591b2a1a41894b05fbc22
+  metadata.gz: 3e3a34fa89c2e677d893c0e08c30248cd0ab1afd
+  data.tar.gz: 1e9b3642bdecd73579f7612088bcc3c185835605
 SHA512:
-  metadata.gz: 80dc6295efaf6483162dc1946ac8fd6e72d5f010bb871102b633465daf47871a9a4547756d86787867332e7022c22394bab5bc0881a6631ea144202234aa7300
-  data.tar.gz: 0d68667633cca33a2b83530e6ba32816590405028d9e9f4f110ea51c975fa0c68af1ecbe5d5ee645aa79efb55fed25647a80bb524976ada6cc78260ffff8e762
+  metadata.gz: ab99a3bdcd46920b7da1b4c1a534ec39c38e86f6f46c6667604a43c42fcaf465f9c493bc616fa7db3fde3e971f794f7ccc8ba7ee60cc1696ea11cca379982d5c
+  data.tar.gz: ba03e641910ceeb050edbf3124243e9deb5acc6bc5c237289dc43b0a76f9712da7ad852b0572ebb1c75e67f43899baa300851104518b4cf71dba4937799c1fed

data/lib/logstash-core/version.rb

@@ -5,4 +5,4 @@
 # Note to authors: this should not include dashes because 'gem' barfs if
 # you include a dash in the version string.
 
-LOGSTASH_CORE_VERSION = "5.5.1.snapshot1"
+LOGSTASH_CORE_VERSION = "5.5.2"

data/lib/logstash/agent.rb

@@ -103,12 +103,12 @@ class LogStash::Agent
     @pipelines[pipeline_id] = pipeline
   end
 
-  def reload_state!
+  def reload_state!(force=false)
     @upgrade_mutex.synchronize do
       @pipelines.each do |pipeline_id, pipeline|
-        next if pipeline.settings.get("config.reload.automatic") == false
+        next if pipeline.settings.get("config.reload.automatic") == false && force == false
         begin
-          reload_pipeline!(pipeline_id)
+          reload_pipeline!(pipeline_id, force)
         rescue => e
           @instance_reload_metric.increment(:failures)
           @pipeline_reload_metric.namespace([pipeline_id.to_sym, :reloads]).tap do |n|
@@ -297,11 +297,11 @@ class LogStash::Agent
   # reload_pipeline trys to reloads the pipeline with id using a potential new configuration if it changed
   # since this method modifies the @pipelines hash it is wrapped in @upgrade_mutex in the parent call `reload_state!`
   # @param id [String] the pipeline id to reload
-  def reload_pipeline!(id)
+  def reload_pipeline!(id, force=false)
     old_pipeline = @pipelines[id]
     new_config = fetch_config(old_pipeline.settings)
 
-    if old_pipeline.config_str == new_config
+    if old_pipeline.config_str == new_config && force == false
       @logger.debug("no configuration change for pipeline", :pipeline => id)
       return
     end

data/lib/logstash/api/commands/default_metadata.rb

@@ -12,7 +12,7 @@ module LogStash
         end
 
         def host
-          Socket.gethostname
+          @@host ||= Socket.gethostname
         end
 
         def version

data/lib/logstash/api/commands/hot_threads_reporter.rb

@@ -17,7 +17,12 @@ class HotThreadsReport
     report << '=' * STRING_SEPARATOR_LENGTH
     report << "\n"
     hash[:threads].each do |thread|
-      thread_report = "#{I18n.t("logstash.web_api.hot_threads.thread_title", :percent_of_cpu_time => thread[:percent_of_cpu_time], :thread_state => thread[:state], :thread_name => thread[:name])} \n"
+      line_str = I18n.t("logstash.web_api.hot_threads.thread_title", 
+        :percent_of_cpu_time => thread[:percent_of_cpu_time], 
+        :thread_state => thread[:state], 
+        :thread_name => thread[:name],
+        :thread_id => thread[:thread_id])
+      thread_report = "#{line_str} \n"
       thread_report << "#{thread[:path]}\n" if thread[:path]
       thread[:traces].each do |trace|
         thread_report << "\t#{trace}\n"
@@ -31,9 +36,10 @@ class HotThreadsReport
 
   def to_hash
     hash = { :time => Time.now.iso8601, :busiest_threads => @thread_dump.top_count, :threads => [] }
-    @thread_dump.each do |thread_name, _hash|
+    @thread_dump.each do |_hash|
       thread_name, thread_path = _hash["thread.name"].split(": ")
       thread = { :name => thread_name,
+                 :thread_id => _hash["thread.id"],
                  :percent_of_cpu_time => cpu_time_as_percent(_hash),
                  :state => _hash["thread.state"]
       }

data/lib/logstash/runner.rb

@@ -428,7 +428,7 @@ class LogStash::Runner < Clamp::StrictCommand
   def trap_sighup
     Stud::trap("HUP") do
       logger.warn(I18n.t("logstash.agent.sighup"))
-      @agent.reload_state!
+      @agent.reload_state!(true)
     end
   end
 

data/lib/logstash/util/thread_dump.rb

@@ -19,12 +19,13 @@ module LogStash
 
       def each(&block)
         i=0
-        dump.each_pair do |thread_name, _hash|
+        dump.each do |hash|
+          thread_name = hash["thread.name"]
           break if i >= top_count
           if ignore
-            next if idle_thread?(thread_name, _hash)
+            next if idle_thread?(thread_name, hash)
           end
-          block.call(thread_name, _hash)
+          block.call(hash)
           i += 1
         end
       end

data/lib/logstash/util/wrapped_acked_queue.rb

@@ -100,6 +100,10 @@ module LogStash; module Util
       end
     end
 
+    def is_empty?
+      @queue.is_empty?
+    end
+
     def close
       @queue.close
       @closed.make_true
@@ -129,7 +133,7 @@ module LogStash; module Util
       def empty?
         @mutex.lock
         begin
-          @queue.is_fully_acked?
+          @queue.is_empty?
         ensure
           @mutex.unlock
         end

data/lib/logstash/version.rb

@@ -11,4 +11,4 @@
 #       eventually this file should be in the root logstash lib fir and dependencies in logstash-core should be
 #       fixed.
 
-LOGSTASH_VERSION = "5.5.1.snapshot1"
+LOGSTASH_VERSION = "5.5.2"

data/locales/en.yml

@@ -79,7 +79,7 @@ en:
           ::: {%{hostname}}
           Hot threads at %{time}, busiestThreads=%{top_count}:
         thread_title: |-
-          %{percent_of_cpu_time} % of cpu usage, state: %{thread_state}, thread name: '%{thread_name}'
+          %{percent_of_cpu_time} % of cpu usage, state: %{thread_state}, thread name: '%{thread_name}', thread id: %{thread_id}
       logging:
         unrecognized_option: |-
           unrecognized option [%{option}]

data/spec/logstash/agent_spec.rb

@@ -162,6 +162,19 @@ describe LogStash::Agent do
             t.join
             subject.shutdown
           end
+
+          context "and force autoreload" do
+            it "reloads the pipeline" do
+              t = Thread.new { subject.execute }
+              sleep(0.01) until subject.running_pipelines? && subject.pipelines.values.first.running?
+              expect(subject).to receive(:reload_pipeline!).with("main", true)
+              subject.reload_state!(true)
+
+              Stud.stop!(t)
+              t.join
+              subject.shutdown
+            end
+          end
         end
 
         context "with a pipeline with auto reloading turned on" do

data/spec/logstash/util/wrapped_acked_queue_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require "spec_helper"
+require "logstash/util/wrapped_acked_queue"
+
+describe LogStash::Util::WrappedAckedQueue do
+  shared_examples "queue tests" do
+    it "is_empty? on creation" do
+      expect(queue.is_empty?).to be_truthy
+    end
+
+    it "not is_empty? after pushing an element" do
+      queue.push(LogStash::Event.new)
+      expect(queue.is_empty?).to be_falsey
+    end
+
+    it "not is_empty? when all elements are not acked" do
+      queue.push(LogStash::Event.new)
+      batch = queue.read_batch(1, 250)
+      expect(batch.get_elements.size).to eq(1)
+      expect(queue.is_empty?).to be_falsey
+    end
+
+    it "is_empty? when all elements are acked" do
+      queue.push(LogStash::Event.new)
+      batch = queue.read_batch(1, 250)
+      expect(batch.get_elements.size).to eq(1)
+      expect(queue.is_empty?).to be_falsey
+      batch.close
+      expect(queue.is_empty?).to be_truthy
+    end
+  end
+
+  context "memory" do
+    let(:page_capacity) { 1024 }
+    let(:max_events) { 0 }
+    let(:max_bytes) { 0 }
+    let(:path) { Stud::Temporary.directory }
+    let(:queue) { LogStash::Util::WrappedAckedQueue.create_memory_based(path, page_capacity, max_events, max_bytes) }
+
+    after do
+      queue.close
+    end
+
+    include_examples "queue tests"
+  end
+
+  context "persisted" do
+    let(:page_capacity) { 1024 }
+    let(:max_events) { 0 }
+    let(:max_bytes) { 0 }
+    let(:checkpoint_acks) { 1024 }
+    let(:checkpoint_writes) { 1024 }
+    let(:checkpoint_interval) { 0 }
+    let(:path) { Stud::Temporary.directory }
+    let(:queue) { LogStash::Util::WrappedAckedQueue.create_file_based(path, page_capacity, max_events, checkpoint_acks, checkpoint_writes, checkpoint_interval, max_bytes) }
+
+    after do
+      queue.close
+    end
+
+    include_examples "queue tests"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 5.5.1.snapshot1
+  version: 5.5.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -551,6 +551,7 @@ files:
 - spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/wrapped_acked_queue_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb
@@ -575,9 +576,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - jar org.apache.logging.log4j:log4j-api, 2.6.2
 - jar org.apache.logging.log4j:log4j-core, 2.6.2
@@ -668,6 +669,7 @@ test_files:
 - spec/logstash/util/safe_uri_spec.rb
 - spec/logstash/util/time_value_spec.rb
 - spec/logstash/util/unicode_trimmer_spec.rb
+- spec/logstash/util/wrapped_acked_queue_spec.rb
 - spec/logstash/util/wrapped_synchronous_queue_spec.rb
 - spec/logstash/util_spec.rb
 - spec/logstash/webserver_spec.rb