elasticsearch-transport 1.0.12 → 1.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e32b60a7684ac31fbed63461ef4d4f7d58c8525
-  data.tar.gz: 05b935d80dd804943ea9bf8b717c3cd77ec65beb
+  metadata.gz: cfbb24f919ca5c508c660a9b121fb0937b16d5ab
+  data.tar.gz: 2efeb80ae1defb9578b2b62d2834f61b86e75983
 SHA512:
-  metadata.gz: c8fcccb368fe251af1a33285d4e9417e9786c40790286a7f9b347743716f299cd130037bcbcb20489dc8d8581ffdb5bcbe5b1f3b8415428c13203ee1b263804f
-  data.tar.gz: 3d78d28acc9de111fdf5e8d0463ad756128a0de23e80954d7542a65ac148bd9b6727279ff13338973d85a8deed6faefd02bbb62eac973dede071a16ee4e827df
+  metadata.gz: aefe90beda8b000367535d535156786126c8f7b49d98cd637352a0cdc1a054f248fd7225973cc2b7a7be72207bfedf9b28bfd475f138144110b79082daa6c37b
+  data.tar.gz: e959b3c3c12990b2280ac9ad3836c3cdfb7c63a90ca5a46f2c78c50d974c3de921602b6f927749a7cc5d29f71809706bfb1705cd643a3e2680e0e1c01bb95ad2

data/lib/elasticsearch/transport/client.rb

@@ -143,22 +143,25 @@ module Elasticsearch
         end
 
         result = hosts.map do |host|
-          case host
-          when String
-            if host =~ /^[a-z]+\:\/\//
-              uri = URI.parse(host)
-              { :scheme => uri.scheme, :user => uri.user, :password => uri.password, :host => uri.host, :path => uri.path, :port => uri.port.to_s }
+          host_parts = case host
+            when String
+              if host =~ /^[a-z]+\:\/\//
+                uri = URI.parse(host)
+                { :scheme => uri.scheme, :user => uri.user, :password => uri.password, :host => uri.host, :path => uri.path, :port => uri.port }
+              else
+                host, port = host.split(':')
+                { :host => host, :port => port }
+              end
+            when URI
+              { :scheme => host.scheme, :user => host.user, :password => host.password, :host => host.host, :path => host.path, :port => host.port }
+            when Hash
+              host
             else
-              host, port = host.split(':')
-              { :host => host, :port => port }
+              raise ArgumentError, "Please pass host as a String, URI or Hash -- #{host.class} given."
             end
-          when URI
-            { :scheme => host.scheme, :user => host.user, :password => host.password, :host => host.host, :path => host.path, :port => host.port.to_s }
-          when Hash
-            host
-          else
-            raise ArgumentError, "Please pass host as a String, URI or Hash -- #{host.class} given."
-          end
+
+          host_parts[:port] = host_parts[:port].to_i unless host_parts[:port].nil?
+          host_parts
         end
 
         result.shuffle! if options[:randomize_hosts]

data/lib/elasticsearch/transport/transport/base.rb

@@ -41,6 +41,7 @@ module Elasticsearch
 
           @sniffer     = options[:sniffer_class] ? options[:sniffer_class].new(self) : Sniffer.new(self)
           @counter     = 0
+          @counter_mtx = Mutex.new
           @last_request_at = Time.now
           @reload_connections = options[:reload_connections]
           @reload_after    = options[:reload_connections].is_a?(Fixnum) ? options[:reload_connections] : DEFAULT_RELOAD_AFTER
@@ -60,7 +61,7 @@ module Elasticsearch
           resurrect_dead_connections! if Time.now > @last_request_at + @resurrect_after
 
           connection = connections.get_connection(options)
-          @counter  += 1
+          @counter_mtx.synchronize { @counter += 1 }
 
           reload_connections!         if reload_connections && counter % reload_after == 0
           connection

data/lib/elasticsearch/transport/transport/connections/connection.rb

@@ -26,6 +26,7 @@ module Elasticsearch
             @host       = arguments[:host]
             @connection = arguments[:connection]
             @options    = arguments[:options] || {}
+            @state_mutex = Mutex.new
 
             @options[:resurrect_timeout] ||= DEFAULT_RESURRECT_TIMEOUT
             @failures = 0
@@ -65,9 +66,11 @@ module Elasticsearch
           # @return [self]
           #
           def dead!
-            @dead       = true
-            @failures  += 1
-            @dead_since = Time.now
+            @state_mutex.synchronize do
+              @dead       = true
+              @failures  += 1
+              @dead_since = Time.now
+            end
             self
           end
 
@@ -76,7 +79,9 @@ module Elasticsearch
           # @return [self]
           #
           def alive!
-            @dead     = false
+            @state_mutex.synchronize do
+              @dead     = false
+            end
             self
           end
 
@@ -85,8 +90,10 @@ module Elasticsearch
           # @return [self]
           #
           def healthy!
-            @dead     = false
-            @failures = 0
+            @state_mutex.synchronize do
+              @dead     = false
+              @failures = 0
+            end
             self
           end
 
@@ -105,7 +112,9 @@ module Elasticsearch
           # @return [Boolean]
           #
           def resurrectable?
-            Time.now > @dead_since + ( @options[:resurrect_timeout] * 2 ** (@failures-1) )
+            @state_mutex.synchronize {
+              Time.now > @dead_since + ( @options[:resurrect_timeout] * 2 ** (@failures-1) )
+            }
           end
 
           # @return [String]

data/lib/elasticsearch/transport/transport/sniffer.rb

@@ -5,7 +5,8 @@ module Elasticsearch
       # Handles node discovery ("sniffing").
       #
       class Sniffer
-        RE_URL  = /\/([^:]*):([0-9]+)\]/ # Use named groups on Ruby 1.9: /\/(?<host>[^:]*):(?<port>[0-9]+)\]/
+        ES1_RE_URL  = /\/([^:]*):([0-9]+)\]/ # Use named groups on Ruby 1.9: /\/(?<host>[^:]*):(?<port>[0-9]+)\]/
+        ES2_RE_URL = /([^:]*):([0-9]+)/
 
         attr_reader   :transport
         attr_accessor :timeout
@@ -30,7 +31,9 @@ module Elasticsearch
           Timeout::timeout(timeout, SnifferTimeoutError) do
             nodes = transport.perform_request('GET', '_nodes/http').body
             hosts = nodes['nodes'].map do |id,info|
-              if matches = info["#{transport.protocol}_address"].to_s.match(RE_URL)
+              addr_str = info["#{transport.protocol}_address"].to_s
+              matches = addr_str.match(ES1_RE_URL) || addr_str.match(ES2_RE_URL)
+              if matches
                 # TODO: Implement lightweight "indifferent access" here
                 info.merge :host => matches[1], :port => matches[2], :id => id
               end

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.12"
+    VERSION = "1.0.13"
   end
 end

data/test/integration/client_test.rb

@@ -5,6 +5,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
   end
 
+  shutdown do
+    Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?
+  end
+
   context "Elasticsearch client" do
     teardown do
       begin; Object.send(:remove_const, :Typhoeus); rescue NameError; end

data/test/integration/transport_test.rb

@@ -5,6 +5,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
   end
 
+  shutdown do
+    Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?
+  end
+
   context "Transport" do
     setup do
       @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i

data/test/unit/client_test.rb

@@ -127,6 +127,17 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         hosts = @client.__extract_hosts( { :host => 'myhost', :scheme => 'https' } )
         assert_equal 'myhost', hosts[0][:host]
         assert_equal 'https',  hosts[0][:scheme]
+        assert_nil             hosts[0][:port]
+      end
+
+      should "extract from hash with a port passed as a string" do
+        hosts = @client.__extract_hosts( { :host => 'myhost', :scheme => 'https', :port => '443' } )
+        assert_equal 443, hosts[0][:port]
+      end
+
+      should "extract from hash with a port passed as an integer" do
+        hosts = @client.__extract_hosts( { :host => 'myhost', :scheme => 'https', :port => 443 } )
+        assert_equal 443, hosts[0][:port]
       end
 
       should "extract from Hashie::Mash" do
@@ -154,10 +165,10 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 2, hosts.size
 
         assert_equal 'host1', hosts[0][:host]
-        assert_equal '1000',  hosts[0][:port]
+        assert_equal 1000,    hosts[0][:port]
 
         assert_equal 'host2', hosts[1][:host]
-        assert_equal '2000',  hosts[1][:port]
+        assert_equal 2000,    hosts[1][:port]
       end
 
       should "extract path" do
@@ -171,7 +182,7 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
 
         assert_equal 'https',  hosts[0][:scheme]
         assert_equal 'myhost', hosts[0][:host]
-        assert_equal '8080',   hosts[0][:port]
+        assert_equal 8080,     hosts[0][:port]
       end
 
       should "extract credentials" do
@@ -181,14 +192,14 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 'USERNAME', hosts[0][:user]
         assert_equal 'PASSWORD', hosts[0][:password]
         assert_equal 'myhost',   hosts[0][:host]
-        assert_equal '8080',     hosts[0][:port]
+        assert_equal 8080,       hosts[0][:port]
       end
 
       should "pass hashes over" do
         hosts = @client.__extract_hosts [{:host => 'myhost', :port => '1000', :foo => 'bar'}]
 
         assert_equal 'myhost', hosts[0][:host]
-        assert_equal '1000',   hosts[0][:port]
+        assert_equal 1000,     hosts[0][:port]
         assert_equal 'bar',    hosts[0][:foo]
       end
 
@@ -200,7 +211,7 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 'USERNAME', hosts[0][:user]
         assert_equal 'PASSWORD', hosts[0][:password]
         assert_equal 'myhost',   hosts[0][:host]
-        assert_equal '4430',     hosts[0][:port]
+        assert_equal 4430,       hosts[0][:port]
       end
 
       should "split comma-separated URLs" do

data/test/unit/sniffer_test.rb

@@ -21,7 +21,7 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
       assert_equal @transport, @sniffer.transport
     end
 
-    should "return an array of hosts as hashes" do
+    should "return an array of hosts as hashes with Elasticsearch 1.x syntax" do
       @transport.expects(:perform_request).returns __nodes_info <<-JSON
         {
           "ok" : true,
@@ -48,6 +48,33 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
       assert_equal 'Node 1',       hosts.first['name']
     end
 
+    should "return an array of hosts as hashes with Elasticsearch 2.0 syntax" do
+      @transport.expects(:perform_request).returns __nodes_info <<-JSON
+        {
+          "ok" : true,
+          "cluster_name" : "elasticsearch_test",
+          "nodes" : {
+            "N1" : {
+              "name" : "Node 1",
+              "transport_address" : "192.168.1.23:9300",
+              "hostname" : "testhost1",
+              "version" : "0.20.6",
+              "http_address" : "192.168.1.23:9200",
+              "thrift_address" : "192.168.1.23:9500",
+              "memcached_address" : "192.168.1.23:11211"
+            }
+          }
+        }
+      JSON
+
+      hosts = @sniffer.hosts
+
+      assert_equal 1, hosts.size
+      assert_equal '192.168.1.23', hosts.first[:host]
+      assert_equal '9200',         hosts.first[:port]
+      assert_equal 'Node 1',       hosts.first['name']
+    end
+
     should "skip hosts without a matching transport protocol" do
       @transport = DummyTransport.new :options => { :protocol => 'memcached' }
       @sniffer   = Elasticsearch::Transport::Transport::Sniffer.new @transport

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json