cequel 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43ac7eabfd0c08bc6351877501405dc45a0f0ee
-  data.tar.gz: 9e926cb705192f68bfe3fb47cdb406de9c6829ac
+  metadata.gz: 4fba208e19ab7eabd8a3f2db192e68a4cc70bd48
+  data.tar.gz: 701fad60ff7b547719c39817abffd3b080a469a5
 SHA512:
-  metadata.gz: ef9d853eab6fa701d06560fb903d410b7539434b0823fca9077db8e74c13301c86dded17fafd148c43c0825e74c89ff0578a833c17f5ab7ff29a9ee7b40b2f3e
-  data.tar.gz: 1d979817ae7d022a2ea0fa96a7f64c232cf602a62f4561a66edd5aa17829b664f758bc5414da66abc0586a3228c440c9a58348bf1bc14501ac1b73a3a185f67a
+  metadata.gz: e94e957983915b7cb434dfdfb4cf913e47d25c687c17f2106d53730bd0624acacf74454c2ca64b29bfae5d31a8ff8bece1e1ef6dd7e19252c41e8de5dee305de
+  data.tar.gz: d9b7ae7438d6b188e5709357bf6c7ba21de7b0af3f26de5311290824381b4c66be2355318ac8cfe974e196f44e3b7b5ea866593adaa27d2797138db1039fa39b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.4.5
+
+* Fix recovery from connection error
+
 ## 1.4.4
 
 * Round time to nearest millisecond when serializing for CQL

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.4.4)
+    cequel (1.4.5)
       activemodel (>= 3.1, < 5.0)
       cql-rb (>= 1.2, < 3.0)
 

data/README.md

@@ -569,6 +569,7 @@ Cequel was written by:
 * Tomohiro Nishimura
 * Masaki Takahashi
 * G Gordon Worley III
+* Clark Bremer
 
 Special thanks to [Brewster](https://www.brewster.com), which supported the 0.x
 releases of Cequel.

data/lib/cequel/metal/keyspace.rb

@@ -23,6 +23,8 @@ module Cequel
       attr_reader :port
       # @return Integer maximum number of retries to reconnect to Cassandra
       attr_reader :max_retries
+      # @return Float delay between retries to reconnect to Cassandra
+      attr_reader :retry_delay
       # @return [Symbol] the default consistency for queries in this keyspace
       # @since 1.1.0
       attr_writer :default_consistency
@@ -121,6 +123,7 @@ module Cequel
         @hosts, @port = extract_hosts_and_port(configuration)
         @credentials  = extract_credentials(configuration)
         @max_retries  = extract_max_retries(configuration)
+        @retry_delay  = extract_retry_delay(configuration)
 
         @name = configuration[:keyspace]
         @default_consistency = configuration[:default_consistency].try(:to_sym)
@@ -171,16 +174,7 @@ module Cequel
       # @see #execute_with_consistency
       #
       def execute(statement, *bind_vars)
-        retries = max_retries
-
-        begin
-          execute_with_consistency(statement, bind_vars, default_consistency)
-        rescue Cql::NotConnectedError, Ione::Io::ConnectionError
-          clear_active_connections!
-          raise if retries < 0
-          retries -= 1
-          retry
-        end
+        execute_with_consistency(statement, bind_vars, default_consistency)
       end
 
       #
@@ -194,9 +188,19 @@ module Cequel
       # @since 1.1.0
       #
       def execute_with_consistency(statement, bind_vars, consistency)
+        retries = max_retries
+
         log('CQL', statement, *bind_vars) do
-          client.execute(sanitize(statement, bind_vars),
-                         consistency || default_consistency)
+          begin
+            client.execute(sanitize(statement, bind_vars),
+                           consistency || default_consistency)
+          rescue Cql::NotConnectedError, Ione::Io::ConnectionError
+            clear_active_connections!
+            raise if retries == 0
+            retries -= 1
+            sleep(retry_delay)
+            retry
+          end
         end
       end
 
@@ -209,6 +213,9 @@ module Cequel
         if defined? @client
           remove_instance_variable(:@client)
         end
+        if defined? @raw_client
+          remove_instance_variable(:@raw_client)
+        end
       end
 
       #
@@ -293,6 +300,10 @@ module Cequel
       def extract_max_retries(configuration)
         configuration.fetch(:max_retries, 3)
       end
+
+      def extract_retry_delay(configuration)
+        configuration.fetch(:retry_delay, 0.5)
+      end
     end
   end
 end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.4.4'
+  VERSION = '1.4.5'
 end

data/spec/examples/metal/keyspace_spec.rb

@@ -97,8 +97,8 @@ describe Cequel::Metal::Keyspace do
 
     context "with a connection error" do
       it "reconnects to cassandra with a new client after first failed connection" do
-        allow(cequel.client).to receive(:execute_with_consistency)
-          .with(statement, [], nil)
+        allow(cequel.client).to receive(:execute)
+          .with(statement, cequel.default_consistency)
           .and_raise(Ione::Io::ConnectionError)
           .once
 

data/templates/config/cequel.yml

@@ -4,12 +4,14 @@ development:
   port: 9042
   keyspace: <%= app_name %>_development
   max_retries: 3
+  retry_delay: 0.5
 
 test:
   host: '127.0.0.1'
   port: 9042
   keyspace: <%= app_name %>_test
   max_retries: 3
+  retry_delay: 0.5
 
 production:
   hosts:
@@ -21,3 +23,4 @@ production:
   username: 'myappuser'
   password: 'password1'
   max_retries: 3
+  retry_delay: 0.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Mat Brown
@@ -22,10 +22,11 @@ authors:
 - Tomohiro Nishimura
 - Masaki Takahashi
 - G Gordon Worley III
+- Clark Bremer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel