logstash-input-elasticsearch 4.8.0 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74690fbfa461c4c9087181c3f95e4feb33f68e6398cc357a1c8d12d6bca8d837
-  data.tar.gz: 67425c9a092529e779e0c7693cc8afa9eaed0cfb188509026881d1972f970f3c
+  metadata.gz: f2739ba5eed141d75ad674402bb35485e0be50c6a7593556dbcda575120bbb54
+  data.tar.gz: 1affc8bfa4aad83cda6c59f0a6b3dcf7ca24a5d7e0e53cacc66f45b88d353ce1
 SHA512:
-  metadata.gz: 63482d80b537ba41ca5d3ed34a1e35dc6550887747b7d50a7320564dbd5fcac3336519cae21c21363322616f6a1c66f803743e2246e2d2dc8adf2b03b0a23231
-  data.tar.gz: 98547555319b8d856ea58ed33b8236fcf15c2483594ca45c9c2e09791b4a20f6250ae7019e4e1be341f2000816a90e522b8c6fb21bec3b1aebc6b511cce2e09a
+  metadata.gz: d4d2eb3be415ddf52ed7b17d06999fe93022004fcf218d11919c750e3b98f8a1ddc943d7d0911232a43fcc8f237a08ffcbd63ba5ec1dd59de9498061f4b4bf25
+  data.tar.gz: 74524dcd7cacd49a324049f80b5cabf5bd2a96c8c634ed15877139371cc8cb89bb38c074a576a0214a3785e218ee5dc0f0966b59de75394e679d8eef34ad14ed

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.8.1
+  - Fixed connection error when using multiple `slices`. [#133](https://github.com/logstash-plugins/logstash-input-elasticsearch/issues/133)
+
 ## 4.8.0
   - Added the ability to configure connection-, request-, and socket-timeouts with `connect_timeout_seconds`, `request_timeout_seconds`, and `socket_timeout_seconds` [#121](https://github.com/logstash-plugins/logstash-input-elasticsearch/issues/121)
 

data/lib/logstash/inputs/elasticsearch.rb

@@ -4,6 +4,7 @@ require "logstash/namespace"
 require "logstash/json"
 require "logstash/util/safe_uri"
 require "base64"
+require_relative "patch"
 
 
 # .Compatibility Note

data/lib/logstash/inputs/patch.rb

@@ -0,0 +1,48 @@
+if Gem.loaded_specs['elasticsearch-transport'].version >= Gem::Version.new("7.2.0")
+  # elasticsearch-transport versions prior to 7.2.0 suffered of a race condition on accessing
+  # the connection pool. This issue was fixed with https://github.com/elastic/elasticsearch-ruby/commit/15f9d78591a6e8823948494d94b15b0ca38819d1
+   # This plugin, at the moment, is forced to use v5.x so we have to monkey patch the gem. When this requirement
+   # ceases, this patch could be removed.
+  puts "WARN remove the patch code into logstash-input-elasticsearch plugin"
+else
+  module Elasticsearch
+    module Transport
+      module Transport
+        module Connections
+          module Selector
+
+            # "Round-robin" selector strategy (default).
+            #
+            class RoundRobin
+              include Base
+
+              # @option arguments [Connections::Collection] :connections Collection with connections.
+              #
+              def initialize(arguments = {})
+                super
+                @mutex = Mutex.new
+                @current = nil
+              end
+
+              # Returns the next connection from the collection, rotating them in round-robin fashion.
+              #
+              # @return [Connections::Connection]
+              #
+              def select(options={})
+                @mutex.synchronize do
+                  conns = connections
+                  if @current && (@current < conns.size-1)
+                    @current += 1
+                  else
+                    @current = 0
+                  end
+                  conns[@current]
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.8.0'
+  s.version         = '4.8.1'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Reads query results from an Elasticsearch cluster"
   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-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.8.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +200,7 @@ files:
 - README.md
 - docs/index.asciidoc
 - lib/logstash/inputs/elasticsearch.rb
+- lib/logstash/inputs/patch.rb
 - logstash-input-elasticsearch.gemspec
 - spec/es_helper.rb
 - spec/fixtures/test_certs/ca/ca.crt