rubberband 0.9.3 → 0.9.4

data/.travis.yml

@@ -3,9 +3,9 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
-#  - jruby-18mode
-#  - jruby-19mode
-#  - jruby-head
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
   - rbx-18mode
   - rbx-19mode
 

data/lib/elasticsearch/client/abstract_client.rb

@@ -21,6 +21,7 @@ module ElasticSearch
       given_servers = Array(servers_or_url).collect do |server|
         begin
           uri = URI.parse(server)
+          raise URI::InvalidURIError, server if uri.path.nil?
           _, default_index, default_type = uri.path.split("/")
           uri.path = "" # is this expected behavior of URI? may be dangerous to rely on
           uri.to_s

data/lib/elasticsearch/client/retrying_client.rb

@@ -18,6 +18,8 @@ module ElasticSearch
       super
       @options = RETRYING_DEFAULTS.merge(@options)
       @retries = options[:retries] || @servers.size
+      @connect_retries_count = 0
+      @execute_retries_count = 0
       @request_count = 0
       @max_requests = @options[:server_max_requests]
       @retry_period = @options[:server_retry_period]
@@ -26,8 +28,11 @@ module ElasticSearch
 
     def connect!
       @current_server = next_server
-      super
-    rescue ElasticSearch::RetryableError
+      clear_connect_retries_count_after do
+        super
+      end
+    rescue ElasticSearch::RetryableError => exception
+      increment_or_raise_on_connect_retry( exception )
       retry
     end
 
@@ -50,7 +55,7 @@ module ElasticSearch
       elsif @live_server_list.empty?
         rebuild_live_server_list!
       end
-      @live_server_list.pop
+      @live_server_list.shift
     end
 
     def rebuild_live_server_list!
@@ -66,9 +71,12 @@ module ElasticSearch
       disconnect_on_max! if @max_requests and @request_count >= @max_requests
       @request_count += 1
       begin
-        super
-      rescue ElasticSearch::RetryableError
+        clear_execute_retries_count_after do
+          super
+        end
+      rescue ElasticSearch::RetryableError => exception
         disconnect!
+        increment_or_raise_on_execute_retry( exception )
         retry
       end
     end
@@ -77,5 +85,41 @@ module ElasticSearch
       @live_server_list.push(@current_server)
       disconnect!
     end
+
+    protected
+
+    def clear_connect_retries_count_after
+      result = yield
+      @connect_retries_count = 0
+      result
+    end
+
+    def clear_execute_retries_count_after
+      result = yield
+      @execute_retries_count = 0
+      @connect_retries_count = 0
+      result
+    end
+
+    def increment_or_raise_on_connect_retry( exception )
+      if @retries <= @connect_retries_count
+        @connect_retries_count = 0
+        @execute_retries_count = 0
+        raise exception
+      else
+        @connect_retries_count += 1
+      end
+    end
+
+    def increment_or_raise_on_execute_retry( exception )
+      if @retries <= @execute_retries_count
+        @execute_retries_count = 0
+        @connect_retries_count = 0
+        raise exception
+      else
+        @execute_retries_count += 1
+      end
+    end
+
   end
 end

data/lib/elasticsearch/transport/http.rb

@@ -55,7 +55,7 @@ module ElasticSearch
           response
         rescue Exception => e
           case e
-          when Faraday::Error::ConnectionFailed
+          when Faraday::Error::ConnectionFailed, Errno::EHOSTUNREACH
             raise ConnectionFailed, $!
           when Faraday::Error::TimeoutError
             raise TimeoutError, $!

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/retrying_client_spec.rb

@@ -0,0 +1,124 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ElasticSearch::RetryingClient do
+
+  context 'will all timeouts' do
+
+    def new_client
+      TimeoutRetryingClient.new( "http://noserverhere.local:9456", :retries => 3, :server_retry_period => nil )
+    end
+
+    describe 'when connecting' do
+      it 'should give up retrying after 3 failures' do
+
+        @client = new_client
+        expect { @client.connect! }.to raise_error( ElasticSearch::TimeoutError )
+        @client.connect_calls.should == 4
+
+      end
+    end
+
+    describe 'when executing' do
+
+      it 'should give up retrying after 3 failures' do
+
+        @client = new_client
+        expect { @client.execute( "get" ) }.to raise_error( ElasticSearch::TimeoutError )
+        @client.execute_calls.should == 4
+
+      end
+
+    end
+
+  end
+
+  context 'with successful response' do
+
+    def new_client
+      CountingClient.new( "http://noserverhere.local:9456", :retries => 3, :server_retry_period => nil )
+    end
+
+    context 'when connecting' do
+
+      it 'should try to connect only once' do
+
+        @client = new_client
+        @client.connect!
+
+        @client.connect_calls.should == 1
+      end
+
+    end
+
+    context 'when executing' do
+
+      it 'should try to execute only once' do
+        @client = new_client
+        @client.execute('get')
+        @client.execute_calls.should == 1
+      end
+
+    end
+
+  end
+
+  context 'with non-retryable-exception' do
+
+    def new_client
+      TimeoutRetryingClient.new( "http://noserverhere.local:9456", :retries => 3, :server_retry_period => nil, :exception => StandardError )
+    end
+
+    it 'should try to connect once and give up' do
+
+      @client = new_client
+      expect { @client.connect! }.to raise_error(StandardError)
+      @client.connect_calls.should == 1
+
+    end
+
+    it 'should try to execute once and give up' do
+      @client = new_client
+      expect { @client.execute('get') }.to raise_error(StandardError)
+      @client.execute_calls.should == 1
+    end
+
+  end
+
+  context 'on next_server calls' do
+
+    before do
+      @servers = [ 'http://noserver.local1', 'http://noserver.local2' ]
+    end
+
+    def new_client( retry_period = nil )
+      CountingRetryingClient.new( @servers, :server_retry_period => retry_period, :randomize_server_list => false )
+    end
+
+    it 'should pick up the next server if one is available' do
+      @client = new_client
+
+      @client.next_server.should == @servers.first
+      @client.next_server.should == @servers.last
+    end
+
+    it 'should re-seed the list if client tries to pick more servers than available' do
+      @client = new_client
+
+      @client.next_server.should == @servers.first
+      @client.next_server.should == @servers.last
+      @client.next_server.should == @servers.first
+    end
+
+    it 'should raise a NoServersAvailable if tried to take too many servers without waiting' do
+
+      @client = new_client 10
+
+      @client.next_server.should == @servers.first
+      @client.next_server.should == @servers.last
+      expect { @client.next_server }.to raise_error(ElasticSearch::NoServersAvailable)
+
+    end
+
+  end
+
+end

data/spec/support/counting_client.rb

@@ -0,0 +1,24 @@
+class CountingClient < ElasticSearch::AbstractClient
+
+  attr_accessor :connect_calls, :disconnect_calls, :execute_calls
+
+  def initialize(servers_or_url, options={})
+    super
+    @connect_calls = 0
+    @disconnect_calls = 0
+    @execute_calls = 0
+  end
+
+  def connect!
+    @connect_calls += 1
+  end
+
+  def disconnect!
+    @disconnect_calls += 1
+  end
+
+  def execute(method_name, *args)
+    @execute_calls += 1
+  end
+
+end

data/spec/support/counting_retrying_client.rb

@@ -0,0 +1,7 @@
+require File.expand_path('../counting_client', __FILE__)
+
+class CountingRetryingClient < CountingClient
+
+  include ElasticSearch::RetryingClient
+
+end

data/spec/support/exception_client.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../counting_client', __FILE__)
+
+class ExceptionClient < CountingClient
+
+  def initialize(servers_or_url, options={})
+    super
+    @exception = options[:exception] || ElasticSearch::TimeoutError
+   end
+
+  def connect!
+    super
+    raise @exception
+  end
+
+  def execute(method_name, *args)
+    super
+    raise @exception
+  end
+
+end

data/spec/support/timeout_retrying_client.rb

@@ -0,0 +1,5 @@
+require File.expand_path('../exception_client', __FILE__)
+
+class TimeoutRetryingClient < ExceptionClient
+  include ElasticSearch::RetryingClient
+end

metadata

@@ -1,199 +1,183 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubberband
-version: !ruby/object:Gem::Version
-  version: 0.9.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.9.4
 platform: ruby
-authors:
-- Grant Rodgers
+authors: 
+  - Grant Rodgers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.8
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+
+date: 2012-09-10 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: faraday
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.8.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: multi_json
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rake
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "2.0"
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: simplecov
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.3.8
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.9.0
+    type: :development
+    version_requirements: *id006
 description: An ElasticSearch client with ThriftClient-like failover handling.
-email:
-- grantr@gmail.com
+email: 
+  - grantr@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
-files:
-- .autotest
-- .gitignore
-- .rspec
-- .travis.yml
-- CONTRIBUTORS
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- TODO
-- lib/elasticsearch.rb
-- lib/elasticsearch/client.rb
-- lib/elasticsearch/client/abstract_client.rb
-- lib/elasticsearch/client/admin_cluster.rb
-- lib/elasticsearch/client/admin_index.rb
-- lib/elasticsearch/client/auto_discovering_client.rb
-- lib/elasticsearch/client/default_scope.rb
-- lib/elasticsearch/client/hits.rb
-- lib/elasticsearch/client/index.rb
-- lib/elasticsearch/client/retrying_client.rb
-- lib/elasticsearch/encoding.rb
-- lib/elasticsearch/encoding/base.rb
-- lib/elasticsearch/encoding/json.rb
-- lib/elasticsearch/transport.rb
-- lib/elasticsearch/transport/base.rb
-- lib/elasticsearch/transport/base_protocol.rb
-- lib/elasticsearch/transport/http.rb
-- lib/elasticsearch/transport/memcached.rb
-- lib/elasticsearch/transport/thrift.rb
-- lib/elasticsearch/transport/thrift/elasticsearch_constants.rb
-- lib/elasticsearch/transport/thrift/elasticsearch_types.rb
-- lib/elasticsearch/transport/thrift/rest.rb
-- lib/elasticsearch/version.rb
-- lib/rubberband.rb
-- rubberband.gemspec
-- spec/admin_spec.rb
-- spec/bulk_spec.rb
-- spec/connect_spec.rb
-- spec/hits_spec.rb
-- spec/http_spec.rb
-- spec/index_spec.rb
-- spec/spec_helper.rb
-- spec/support/dummy_transport.rb
-- spec/type_spec.rb
-- vendor/elasticsearch/elasticsearch.thrift
+
+extra_rdoc_files: 
+  - LICENSE
+  - README.md
+files: 
+  - .autotest
+  - .gitignore
+  - .rspec
+  - .travis.yml
+  - CONTRIBUTORS
+  - Gemfile
+  - LICENSE
+  - README.md
+  - Rakefile
+  - TODO
+  - lib/elasticsearch.rb
+  - lib/elasticsearch/client.rb
+  - lib/elasticsearch/client/abstract_client.rb
+  - lib/elasticsearch/client/admin_cluster.rb
+  - lib/elasticsearch/client/admin_index.rb
+  - lib/elasticsearch/client/auto_discovering_client.rb
+  - lib/elasticsearch/client/default_scope.rb
+  - lib/elasticsearch/client/hits.rb
+  - lib/elasticsearch/client/index.rb
+  - lib/elasticsearch/client/retrying_client.rb
+  - lib/elasticsearch/encoding.rb
+  - lib/elasticsearch/encoding/base.rb
+  - lib/elasticsearch/encoding/json.rb
+  - lib/elasticsearch/transport.rb
+  - lib/elasticsearch/transport/base.rb
+  - lib/elasticsearch/transport/base_protocol.rb
+  - lib/elasticsearch/transport/http.rb
+  - lib/elasticsearch/transport/memcached.rb
+  - lib/elasticsearch/transport/thrift.rb
+  - lib/elasticsearch/transport/thrift/elasticsearch_constants.rb
+  - lib/elasticsearch/transport/thrift/elasticsearch_types.rb
+  - lib/elasticsearch/transport/thrift/rest.rb
+  - lib/elasticsearch/version.rb
+  - lib/rubberband.rb
+  - rubberband.gemspec
+  - spec/admin_spec.rb
+  - spec/bulk_spec.rb
+  - spec/connect_spec.rb
+  - spec/hits_spec.rb
+  - spec/http_spec.rb
+  - spec/index_spec.rb
+  - spec/retrying_client_spec.rb
+  - spec/spec_helper.rb
+  - spec/support/counting_client.rb
+  - spec/support/counting_retrying_client.rb
+  - spec/support/dummy_transport.rb
+  - spec/support/exception_client.rb
+  - spec/support/timeout_retrying_client.rb
+  - spec/type_spec.rb
+  - vendor/elasticsearch/elasticsearch.thrift
 homepage: http://github.com/grantr/rubberband
-licenses:
-- Apache v2
+licenses: 
+  - Apache v2
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: rubberband
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client with ThriftClient-like failover handling.
-test_files:
-- spec/admin_spec.rb
-- spec/bulk_spec.rb
-- spec/connect_spec.rb
-- spec/hits_spec.rb
-- spec/http_spec.rb
-- spec/index_spec.rb
-- spec/spec_helper.rb
-- spec/support/dummy_transport.rb
-- spec/type_spec.rb
-has_rdoc: 
+test_files: 
+  - spec/admin_spec.rb
+  - spec/bulk_spec.rb
+  - spec/connect_spec.rb
+  - spec/hits_spec.rb
+  - spec/http_spec.rb
+  - spec/index_spec.rb
+  - spec/retrying_client_spec.rb
+  - spec/spec_helper.rb
+  - spec/support/counting_client.rb
+  - spec/support/counting_retrying_client.rb
+  - spec/support/dummy_transport.rb
+  - spec/support/exception_client.rb
+  - spec/support/timeout_retrying_client.rb
+  - spec/type_spec.rb