cql-rb 1.1.2 → 1.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTJjMzQ5MTY0M2I5N2JjYzZmODFkODQwNzY3ZmE2MmU1MGZjZGUzMw==
-  data.tar.gz: !binary |-
-    N2I0MjdmODYxOTM0YjgwODFjNThhZDJmOWFlMzdiNDdjYjJmODBmNQ==
+SHA1:
+  metadata.gz: 77764255905873f7b923f9fca746dbef0496eb15
+  data.tar.gz: c1c39af44330064cb4d9dd2693d81384dc69f09f
 SHA512:
-  metadata.gz: !binary |-
-    MzE0MWU4ZTUxYmNjOGFkMDc0MzE1YTgxMGEyN2YzMzY2NDYzYTJjZTYxNDM5
-    ZTU3NGJiY2MxYjAyZjBjOWU3NmM1NmNiMDU2ZmI0YWYxMDUyOGI5OTQ1M2Zi
-    YzBkZmRmODIyMTUyZTUxMGM3MTk5YTg4MDE3YTZhODAxY2U4MjE=
-  data.tar.gz: !binary |-
-    ZmMwYTY2NTU3MGZhMjMyOTk0NjhkZjRmMTA2YmU2MTVhNzYxMmRhZDkzNmU2
-    NWNiOTY1YmYzYjlkOGZlMTkyMDdkMzJiMjQyMzY1ZDFkNGI3ZDE4OTUyNzFj
-    ZTgyZWU0YzA3OTVmOWQwYjEzMDgwZTRmNmM2NDgxMjQwNDc2MTA=
+  metadata.gz: 14452316f397f8f2bdc37f764aaf7c070625be977c6b579c4eb881d3e9736a33eb720da296f370c7dc27de7d4fe1917f192267f1a884ae3381afd870378edbd7
+  data.tar.gz: fa4f95a86ab0ae162ccc64c9eaed8f3c99c7bc7cf217750617e3339cfba62d31badc1609f63ffc65026818777f9bc69bacdcaa21f88d32d07b730c7f5f007ef2

data/lib/cql/client/asynchronous_client.rb

@@ -101,6 +101,7 @@ module Cql
       DEFAULT_CONSISTENCY = :quorum
       DEFAULT_PORT = 9042
       DEFAULT_CONNECTION_TIMEOUT = 10
+      MAX_RECONNECTION_ATTEMPTS = 5
 
       def extract_hosts(options)
         if options[:hosts]
@@ -170,27 +171,37 @@ module Cql
           end
         end
         connection.on_event do |event|
-          begin
-            if event.change == 'UP'
-              @logger.debug('Received UP event')
-              handle_topology_change
+          if event.change == 'UP' || event.change == 'NEW_NODE'
+            @logger.debug('Received %s event' % event.change)
+            unless @looking_for_nodes
+              @looking_for_nodes = true
+              handle_topology_change.on_complete do |f|
+                @looking_for_nodes = false
+              end
             end
           end
         end
       end
 
-      def handle_topology_change
-        seed_connections = @connection_manager.snapshot
-        f = @connection_helper.discover_peers(seed_connections, keyspace)
-        f.on_value do |connections|
-          connected_connections = connections.select(&:connected?)
-          if connected_connections.any?
-            @connection_manager.add_connections(connected_connections)
-          else
-            @logger.debug('Scheduling new peer discovery in 1s')
-            f = @io_reactor.schedule_timer(1)
-            f.on_value do
-              handle_topology_change
+      def handle_topology_change(remaning_attempts=MAX_RECONNECTION_ATTEMPTS)
+        with_failure_handler do
+          seed_connections = @connection_manager.snapshot
+          f = @connection_helper.discover_peers(seed_connections, keyspace)
+          f.flat_map do |connections|
+            connected_connections = connections.select(&:connected?)
+            if connected_connections.any?
+              @connection_manager.add_connections(connected_connections)
+              Future.resolved
+            elsif remaning_attempts > 0
+              timeout = 2**(MAX_RECONNECTION_ATTEMPTS - remaning_attempts)
+              @logger.debug('Scheduling new peer discovery in %ds' % timeout)
+              f = @io_reactor.schedule_timer(timeout)
+              f.flat_map do
+                handle_topology_change(remaning_attempts - 1)
+              end
+            else
+              @logger.warn('Giving up looking for additional nodes')
+              Future.resolved
             end
           end
         end

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.1.3'.freeze
 end

data/spec/cql/client/asynchronous_client_spec.rb

@@ -832,6 +832,13 @@ module Cql
           connections.select(&:connected?).should have(3).items
         end
 
+        it 'reconnects when it receives a topology change NEW_NODE event' do
+          connections.first.close
+          event = Protocol::TopologyChangeEventResponse.new('NEW_NODE', IPAddr.new('1.1.1.1'), 9999)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          connections.select(&:connected?).should have(3).items
+        end
+
         it 'eventually reconnects even when the node doesn\'t respond at first' do
           timer_promise = Promise.new
           io_reactor.stub(:schedule_timer).and_return(timer_promise.future)
@@ -845,11 +852,39 @@ module Cql
           connections.select(&:connected?).should have(3).items
         end
 
-        it 'connects when it receives a topology change UP event' do
-          min_peers[0] = 3
-          event = Protocol::TopologyChangeEventResponse.new('UP', IPAddr.new('1.1.1.1'), 9999)
+        it 'eventually stops attempting to reconnect if no new nodes are found' do
+          io_reactor.stub(:schedule_timer).and_return(Future.resolved)
+          io_reactor.stub(:connect).and_return(Future.failed(Io::ConnectionError.new))
+          connections.first.close
+          event = Protocol::TopologyChangeEventResponse.new('NEW_NODE', IPAddr.new('1.1.1.1'), 9999)
           connections.select(&:has_event_listener?).first.trigger_event(event)
-          connections.select(&:connected?).should have(4).items
+          io_reactor.should have_received(:schedule_timer).exactly(5).times
+        end
+
+        it 'does not start a new reconnection loop when one is already in progress' do
+          timer_promises = Array.new(5) { Promise.new }
+          io_reactor.stub(:schedule_timer).and_return(*timer_promises.map(&:future))
+          io_reactor.stub(:connect).and_return(Future.failed(Io::ConnectionError.new))
+          connections.first.close
+          event = Protocol::StatusChangeEventResponse.new('UP', IPAddr.new('1.1.1.1'), 9999)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          timer_promises.first.fulfill
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          timer_promises.drop(1).each(&:fulfill)
+          io_reactor.should have_received(:schedule_timer).exactly(5).times
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          io_reactor.should have_received(:schedule_timer).exactly(10).times
+        end
+
+        it 'allows a new reconnection loop to start even if the previous failed' do
+          io_reactor.stub(:schedule_timer).and_raise('BORK!')
+          io_reactor.stub(:connect).and_return(Future.failed(Io::ConnectionError.new))
+          connections.first.close
+          event = Protocol::TopologyChangeEventResponse.new('NEW_NODE', IPAddr.new('1.1.1.1'), 9999)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          io_reactor.stub(:schedule_timer).and_return(Future.resolved)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          io_reactor.should have_received(:schedule_timer).exactly(6).times
         end
 
         it 'registers a new event listener when the current event listening connection closes' do
@@ -916,6 +951,14 @@ module Cql
           logger.should have_received(:debug).with(/Received UP event/)
         end
 
+        it 'logs when it receives a NEW_NODE event' do
+          logger.stub(:debug)
+          client.connect.value
+          event = Protocol::TopologyChangeEventResponse.new('NEW_NODE', IPAddr.new('1.1.1.1'), 9999)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          logger.should have_received(:debug).with(/Received NEW_NODE event/)
+        end
+
         it 'logs when it fails with a connect after an UP event' do
           logger.stub(:debug)
           logger.stub(:warn)
@@ -927,6 +970,16 @@ module Cql
           logger.should have_received(:debug).with(/Scheduling new peer discovery in \d+s/)
         end
 
+        it 'logs when it gives up attempting to reconnect' do
+          logger.stub(:warn)
+          client.connect.value
+          io_reactor.stub(:schedule_timer).and_return(Future.resolved)
+          io_reactor.stub(:connect).and_return(Future.failed(Io::ConnectionError.new))
+          event = Protocol::StatusChangeEventResponse.new('UP', IPAddr.new('1.1.1.1'), 9999)
+          connections.select(&:has_event_listener?).first.trigger_event(event)
+          logger.should have_received(:warn).with(/Giving up looking for additional nodes/).at_least(1).times
+        end
+
         it 'logs when it disconnects' do
           logger.stub(:info)
           client.connect.value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -120,12 +120,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []